[java-identity-provider] 13/51: IDP-1121 Move (filter) test xml files to their correct locations
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:42:44 EST 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2f2229f7e75d8db50f4b8dd6022f836f3cfecc34
commit 2f2229f7e75d8db50f4b8dd6022f836f3cfecc34
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 28 16:34:19 2018 +0000
IDP-1121 Move (filter) test xml files to their correct locations
https://issues.shibboleth.net/jira/browse/IDP-1121
---
.../spring/BaseAttributeFilterParserTest.java | 4 +--
.../spring/policy/PredicateRuleParserTest.java | 6 ++---
.../saml/AttributeInMetadataRuleParserTest.java | 2 +-
.../MappedAttributeInMetadataRuleParserTest.java | 2 +-
.../attribute/filter/matcher/afp/andSingleton.xml | 8 ------
.../filter/matcher/afp/mappedInMetadata.xml | 17 ------------
.../filter/matcher/afp/requestedInMetadata.xml | 11 --------
.../idp/attribute/filter/matcher/{afp => }/and.xml | 0
.../idp/attribute/filter/matcher/andSingleton.xml | 15 +++++------
.../idp/attribute/filter/matcher/{afp => }/any.xml | 0
.../filter/matcher/{afp => }/attributeRegex.xml | 0
.../matcher/{afp => }/attributeRequester.xml | 0
.../filter/matcher/{afp => }/attributeScope.xml | 0
.../matcher/{afp => }/attributeScopeRegex.xml | 0
.../filter/matcher/{afp => }/attributeValueId.xml | 0
.../matcher/{afp => }/attributeValueNoId.xml | 0
.../filter/matcher/{afp => }/implicit.xml | 0
.../attribute/filter/matcher/mappedInMetadata.xml | 19 ++++++-------
.../idp/attribute/filter/matcher/{afp => }/not.xml | 0
.../idp/attribute/filter/matcher/{afp => }/or.xml | 0
.../filter/matcher/{afp => }/orSingleton.xml | 0
.../filter/matcher/{afp => }/proxiedRequester.xml | 0
.../filter/matcher/requestedInMetadata.xml | 31 ++++++++--------------
.../filter/matcher/{afp => }/scripted-v8.xml | 0
.../filter/matcher/{afp => }/scripted.xml | 0
.../attribute/filter/policyrule/{afp => }/and.xml | 0
.../filter/policyrule/{afp => }/andSingleton.xml | 0
.../attribute/filter/policyrule/{afp => }/any.xml | 0
.../policyrule/{afp => }/attributeIssuer.xml | 0
.../{afp => }/attributeRegexRequester.xml | 0
.../policyrule/{afp => }/attributeRequester.xml | 0
.../policyrule/{afp => }/attributeValueId.xml | 0
.../policyrule/{afp => }/attributeValueNoId.xml | 0
.../filter/policyrule/{afp => }/issuerRegex.xml | 0
.../attribute/filter/policyrule/{afp => }/not.xml | 0
.../policyrule/{afp => }/numberAttrValues.xml | 0
.../attribute/filter/policyrule/{afp => }/or.xml | 0
.../filter/policyrule/{afp => }/orSingleton.xml | 0
.../filter/policyrule/{afp => }/predicate1.xml | 0
.../filter/policyrule/{afp => }/predicate2.xml | 0
.../filter/policyrule/{afp => }/predicateRp.xml | 0
.../filter/policyrule/{afp => }/principalName.xml | 0
.../policyrule/{afp => }/principalNameRegex.xml | 0
.../policyrule/{afp => }/proxiedRegexRequester.xml | 0
.../policyrule/{afp => }/proxiedRequester.xml | 0
.../{afp => }/registrationAuthorityOne.xml | 0
.../{afp => }/registrationAuthorityTwo.xml | 0
.../filter/policyrule/{afp => }/requesterEA2.xml | 0
.../policyrule/{afp => }/requesterEARegex2.xml | 0
.../filter/policyrule/{afp => }/requesterEG2.xml | 0
.../policyrule/{afp => }/requesterNameId2.xml | 0
.../filter/policyrule/{afp => }/scripted-v8.xml | 0
.../filter/policyrule/{afp => }/scripted.xml | 0
.../policyrule/{afp => }/scriptedNotThere.xml | 0
54 files changed, 33 insertions(+), 82 deletions(-)
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
index 7632594..efd9406 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
@@ -114,7 +114,7 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
context.setDisplayName("ApplicationContext: Policy Rule");
setTestContext(context);
- final String path = POLICY_RULE_PATH + "afp/" + fileName;
+ final String path = POLICY_RULE_PATH + fileName;
final AttributeFilterPolicy policy =
getBean(path, AttributeFilterPolicy.class, context);
@@ -128,7 +128,7 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
context.setDisplayName("ApplicationContext: Matcher");
setTestContext(context);
- final String path = MATCHER_PATH + "afp/" + fileName;
+ final String path = MATCHER_PATH + fileName;
final AttributeRule rule = getBean(path, AttributeRule.class, context);
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
index 23ba853..e8d5d4f 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
@@ -43,7 +43,7 @@ public class PredicateRuleParserTest extends BaseAttributeFilterParserTest {
setTestContext(ctx);
SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(ctx);
- beanDefinitionReader.loadBeanDefinitions(new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH + "afp/"
+ beanDefinitionReader.loadBeanDefinitions(new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
+ "predicate1.xml"), new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
+ "predicateBeans.xml"));
@@ -66,7 +66,7 @@ public class PredicateRuleParserTest extends BaseAttributeFilterParserTest {
SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(ctx);
beanDefinitionReader.loadBeanDefinitions(new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
- + "predicateBeans.xml"), new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH + "afp/"
+ + "predicateBeans.xml"), new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
+ "predicate2.xml"));
ctx.refresh();
@@ -92,7 +92,7 @@ public class PredicateRuleParserTest extends BaseAttributeFilterParserTest {
SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(ctx);
beanDefinitionReader.loadBeanDefinitions(new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
- + "predicateBeans.xml"), new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH + "afp/"
+ + "predicateBeans.xml"), new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
+ "predicateRp.xml"));
ctx.refresh();
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
index 8d8d056..c9d562a 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
@@ -40,7 +40,7 @@ public class AttributeInMetadataRuleParserTest extends BaseAttributeFilterParse
setTestContext(context);
context.setDisplayName("ApplicationContext: Matcher");
- final AttributeRule rule = getBean(MATCHER_PATH + "afp/" + "requestedInMetadata.xml", AttributeRule.class, context);
+ final AttributeRule rule = getBean(MATCHER_PATH + "requestedInMetadata.xml", AttributeRule.class, context);
rule.initialize();
AttributeInMetadataMatcher matcher = (AttributeInMetadataMatcher) rule.getMatcher();
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java
index 7797746..03f61fe 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java
@@ -40,7 +40,7 @@ public class MappedAttributeInMetadataRuleParserTest extends BaseAttributeFilte
setTestContext(context);
context.setDisplayName("ApplicationContext: Matcher");
- final AttributeRule rule = getBean(MATCHER_PATH + "afp/mappedInMetadata.xml", AttributeRule.class, context);
+ final AttributeRule rule = getBean(MATCHER_PATH + "mappedInMetadata.xml", AttributeRule.class, context);
rule.initialize();
MappedAttributeInMetadataMatcher matcher = (MappedAttributeInMetadataMatcher) rule.getMatcher();
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/andSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/andSingleton.xml
deleted file mode 100644
index d12dbd7..0000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/andSingleton.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<AttributeRule attributeID="email"
- xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PermitValueRule xsi:type="AND">
- <Rule xsi:type="ANY" />
- </PermitValueRule>
-</AttributeRule>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/mappedInMetadata.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/mappedInMetadata.xml
deleted file mode 100644
index 60c6ce0..0000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/mappedInMetadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="MappedAttributeInMetadata"
- id="PRR"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"/>
-
- <AttributeRule attributeID="email">
-
- <PermitValueRule xsi:type="MappedAttributeInMetadata"
- id="PermitRule"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"
- />
- </AttributeRule>
-</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/requestedInMetadata.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/requestedInMetadata.xml
deleted file mode 100644
index 7a88039..0000000
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/requestedInMetadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
- <PolicyRequirementRule xsi:type="AttributeInMetadata" id="PRR" onlyIfRequired="true"
- matchIfMetadataSilent="true" />
-
- <AttributeRule attributeID="email">
-
- <PermitValueRule xsi:type="AttributeInMetadata" id="PermitRule" onlyIfRequired="true"
- matchIfMetadataSilent="true" />
- </AttributeRule>
-</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/and.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/and.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/andSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/andSingleton.xml
index f9a1b4d..d12dbd7 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/andSingleton.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/andSingleton.xml
@@ -1,9 +1,8 @@
-<afp:AttributeRule attributeID="email"
- xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
+<AttributeRule attributeID="email"
+ xmlns="urn:mace:shibboleth:2.0:afp"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd">
- <afp:PermitValueRule xsi:type="basic:AND">
- <basic:Rule xsi:type="basic:ANY" />
- </afp:PermitValueRule>
-</afp:AttributeRule>
\ No newline at end of file
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PermitValueRule xsi:type="AND">
+ <Rule xsi:type="ANY" />
+ </PermitValueRule>
+</AttributeRule>
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/any.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/any.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/any.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/any.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegex.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRegex.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegex.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRequester.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeRequester.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRequester.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScope.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScope.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScope.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScope.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScopeRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeRegex.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeScopeRegex.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeRegex.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueId.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueNoId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueNoId.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/attributeValueNoId.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueNoId.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/implicit.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/implicit.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/implicit.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/implicit.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/mappedInMetadata.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/mappedInMetadata.xml
index b8b4403..60c6ce0 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/mappedInMetadata.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/mappedInMetadata.xml
@@ -1,20 +1,17 @@
-<afp:AttributeFilterPolicy id="MostBasicExample"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
- <afp:PolicyRequirementRule xsi:type="saml:MappedAttributeInMetadata"
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="MappedAttributeInMetadata"
id="PRR"
onlyIfRequired="true"
matchIfMetadataSilent="true"/>
- <afp:AttributeRule attributeID="email">
+ <AttributeRule attributeID="email">
- <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata"
+ <PermitValueRule xsi:type="MappedAttributeInMetadata"
id="PermitRule"
onlyIfRequired="true"
matchIfMetadataSilent="true"
/>
- </afp:AttributeRule>
-</afp:AttributeFilterPolicy>
\ No newline at end of file
+ </AttributeRule>
+</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/not.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/not.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/or.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/or.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/orSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/orSingleton.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/orSingleton.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/orSingleton.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/proxiedRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/proxiedRequester.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/proxiedRequester.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/proxiedRequester.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml
index 5b27cb9..7a88039 100644
--- a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml
+++ b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml
@@ -1,20 +1,11 @@
-<afp:AttributeFilterPolicy id="MostBasicExample"
- xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
- urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
- urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
- <afp:PolicyRequirementRule xsi:type="saml:AttributeInMetadata"
- id="PRR"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"/>
-
- <afp:AttributeRule attributeID="email">
-
- <afp:PermitValueRule xsi:type="saml:AttributeInMetadata"
- id="PermitRule"
- onlyIfRequired="true"
- matchIfMetadataSilent="true"
- />
- </afp:AttributeRule>
-</afp:AttributeFilterPolicy>
\ No newline at end of file
+<AttributeFilterPolicy id="MostBasicExample" xmlns="urn:mace:shibboleth:2.0:afp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd">
+ <PolicyRequirementRule xsi:type="AttributeInMetadata" id="PRR" onlyIfRequired="true"
+ matchIfMetadataSilent="true" />
+
+ <AttributeRule attributeID="email">
+
+ <PermitValueRule xsi:type="AttributeInMetadata" id="PermitRule" onlyIfRequired="true"
+ matchIfMetadataSilent="true" />
+ </AttributeRule>
+</AttributeFilterPolicy>
\ No newline at end of file
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted-v8.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted-v8.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted-v8.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted-v8.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/afp/scripted.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/and.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/and.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/and.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/and.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/andSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/andSingleton.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/any.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/any.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/any.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/any.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeIssuer.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeIssuer.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeIssuer.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeIssuer.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRegexRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRegexRequester.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRegexRequester.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRegexRequester.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRequester.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeRequester.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRequester.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeValueId.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueId.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeValueId.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueNoId.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeValueNoId.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/attributeValueNoId.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeValueNoId.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/issuerRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerRegex.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/issuerRegex.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerRegex.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/not.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/not.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/not.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/not.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/numberAttrValues.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/numberAttrValues.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/numberAttrValues.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/numberAttrValues.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/or.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/or.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/or.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/or.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/orSingleton.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/orSingleton.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate1.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate1.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate1.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate1.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate2.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicate2.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate2.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicateRp.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateRp.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/predicateRp.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateRp.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalName.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/principalName.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalName.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/principalName.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalNameRegex.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/principalNameRegex.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/principalNameRegex.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/principalNameRegex.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/proxiedRegexRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedRegexRequester.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/proxiedRegexRequester.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedRegexRequester.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/proxiedRequester.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedRequester.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/proxiedRequester.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedRequester.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityOne.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityOne.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityOne.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityOne.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityTwo.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityTwo.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/registrationAuthorityTwo.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityTwo.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEA2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEA2.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEA2.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEA2.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEARegex2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEARegex2.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEARegex2.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEARegex2.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEG2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEG2.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterEG2.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEG2.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterNameId2.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterNameId2.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/requesterNameId2.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterNameId2.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted-v8.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted-v8.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted-v8.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted-v8.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scripted.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml
diff --git a/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scriptedNotThere.xml b/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scriptedNotThere.xml
similarity index 100%
rename from idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/afp/scriptedNotThere.xml
rename to idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scriptedNotThere.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list