[libshib-common-java] 03/05: Imported Upstream version 1.4.0

Matthew Vernon matthew at moszumanska.debian.org
Tue Jun 17 17:03:54 UTC 2014


This is an automated email from the git hooks/post-receive script.

matthew pushed a commit to annotated tag debian/1.4.0-2
in repository libshib-common-java.

commit 7799aab6986c59b0e70fdeda49259f4058cbdc83
Author: Matthew Vernon <mcv21 at cam.ac.uk>
Date:   Tue Jun 17 17:51:04 2014 +0100

    Imported Upstream version 1.4.0
---
 .settings/.svn/all-wcprops                         |   29 -
 .settings/.svn/entries                             |  164 -
 .../org.eclipse.core.resources.prefs.svn-base      |    6 -
 .../text-base/org.eclipse.jdt.core.prefs.svn-base  |  351 --
 .../text-base/org.eclipse.jdt.ui.prefs.svn-base    |   63 -
 .../text-base/org.eclipse.m2e.core.prefs.svn-base  |    4 -
 .svn/all-wcprops                                   |   29 -
 .svn/dir-prop-base                                 |    7 -
 .svn/entries                                       |  173 -
 .svn/prop-base/pom.xml.svn-base                    |    9 -
 .svn/text-base/.checkstyle.svn-base                |   16 -
 .svn/text-base/.classpath.svn-base                 |   36 -
 .svn/text-base/.project.svn-base                   |   29 -
 .svn/text-base/pom.xml.svn-base                    |  287 -
 doc/.svn/all-wcprops                               |   23 -
 doc/.svn/dir-prop-base                             |    8 -
 doc/.svn/entries                                   |  130 -
 doc/.svn/prop-base/CREDITS.txt.svn-base            |    5 -
 doc/.svn/prop-base/LICENSE.txt.svn-base            |    5 -
 doc/.svn/prop-base/RELEASE-NOTES.txt.svn-base      |    5 -
 doc/.svn/text-base/CREDITS.txt.svn-base            |   94 -
 doc/.svn/text-base/LICENSE.txt.svn-base            |  174 -
 doc/.svn/text-base/RELEASE-NOTES.txt.svn-base      |  192 -
 src/.svn/all-wcprops                               |    5 -
 src/.svn/entries                                   |   34 -
 src/main/.svn/all-wcprops                          |    5 -
 src/main/.svn/entries                              |   37 -
 src/main/assembly/.svn/all-wcprops                 |   11 -
 src/main/assembly/.svn/entries                     |   62 -
 src/main/assembly/.svn/prop-base/bin.xml.svn-base  |    9 -
 src/main/assembly/.svn/text-base/bin.xml.svn-base  |   57 -
 src/main/java/.svn/all-wcprops                     |   11 -
 src/main/java/.svn/entries                         |   65 -
 .../java/.svn/prop-base/overview.html.svn-base     |    5 -
 .../java/.svn/text-base/overview.html.svn-base     |    6 -
 src/main/java/edu/.svn/all-wcprops                 |    5 -
 src/main/java/edu/.svn/entries                     |   31 -
 src/main/java/edu/internet2/.svn/all-wcprops       |    5 -
 src/main/java/edu/internet2/.svn/entries           |   31 -
 .../java/edu/internet2/middleware/.svn/all-wcprops |    5 -
 .../java/edu/internet2/middleware/.svn/entries     |   31 -
 .../middleware/shibboleth/.svn/all-wcprops         |    5 -
 .../internet2/middleware/shibboleth/.svn/entries   |   31 -
 .../middleware/shibboleth/common/.svn/all-wcprops  |   23 -
 .../middleware/shibboleth/common/.svn/entries      |  166 -
 .../prop-base/ShibbolethConstants.java.svn-base    |    5 -
 .../prop-base/ShibbolethException.java.svn-base    |    5 -
 .../common/.svn/prop-base/Version.java.svn-base    |    5 -
 .../text-base/ShibbolethConstants.java.svn-base    |   36 -
 .../text-base/ShibbolethException.java.svn-base    |   60 -
 .../common/.svn/text-base/Version.java.svn-base    |  105 -
 .../shibboleth/common/attribute/.svn/all-wcprops   |   35 -
 .../shibboleth/common/attribute/.svn/entries       |  210 -
 .../prop-base/AttributeAuthority.java.svn-base     |    5 -
 .../prop-base/AttributeAuthorityCLI.java.svn-base  |    5 -
 .../AttributeRequestContext.java.svn-base          |    5 -
 .../AttributeRequestException.java.svn-base        |    5 -
 .../.svn/prop-base/BaseAttribute.java.svn-base     |    5 -
 .../text-base/AttributeAuthority.java.svn-base     |   42 -
 .../text-base/AttributeAuthorityCLI.java.svn-base  |  469 --
 .../AttributeRequestContext.java.svn-base          |   83 -
 .../AttributeRequestException.java.svn-base        |   62 -
 .../.svn/text-base/BaseAttribute.java.svn-base     |  122 -
 .../common/attribute/encoding/.svn/all-wcprops     |   53 -
 .../common/attribute/encoding/.svn/entries         |  303 -
 .../.svn/prop-base/AttributeEncoder.java.svn-base  |    5 -
 .../AttributeEncodingException.java.svn-base       |    5 -
 .../prop-base/SAML1AttributeEncoder.java.svn-base  |    5 -
 .../SAML1NameIdentifierEncoder.java.svn-base       |    5 -
 .../prop-base/SAML2AttributeEncoder.java.svn-base  |    5 -
 .../prop-base/SAML2NameIDEncoder.java.svn-base     |    5 -
 .../SAMLNameIdentifierEncoder.java.svn-base        |    5 -
 .../XMLObjectAttributeEncoder.java.svn-base        |    5 -
 .../.svn/text-base/AttributeEncoder.java.svn-base  |   60 -
 .../AttributeEncodingException.java.svn-base       |   62 -
 .../text-base/SAML1AttributeEncoder.java.svn-base  |   38 -
 .../SAML1NameIdentifierEncoder.java.svn-base       |   25 -
 .../text-base/SAML2AttributeEncoder.java.svn-base  |   52 -
 .../text-base/SAML2NameIDEncoder.java.svn-base     |   25 -
 .../SAMLNameIdentifierEncoder.java.svn-base        |   56 -
 .../XMLObjectAttributeEncoder.java.svn-base        |   30 -
 .../attribute/encoding/provider/.svn/all-wcprops   |   89 -
 .../attribute/encoding/provider/.svn/entries       |  504 --
 .../AbstractAttributeEncoder.java.svn-base         |    5 -
 .../AbstractSAML1AttributeEncoder.java.svn-base    |    5 -
 .../AbstractSAML2AttributeEncoder.java.svn-base    |    5 -
 .../AbstractScopedAttributeEncoder.java.svn-base   |    5 -
 .../SAML1Base64AttributeEncoder.java.svn-base      |    5 -
 ...SAML1ScopedStringAttributeEncoder.java.svn-base |    5 -
 .../SAML1StringAttributeEncoder.java.svn-base      |    5 -
 .../SAML1StringNameIdentifierEncoder.java.svn-base |    5 -
 .../SAML1XMLObjectAttributeEncoder.java.svn-base   |    5 -
 .../SAML2Base64AttributeEncoder.java.svn-base      |    5 -
 ...SAML2ScopedStringAttributeEncoder.java.svn-base |    5 -
 .../SAML2StringAttributeEncoder.java.svn-base      |    5 -
 .../SAML2StringNameIDEncoder.java.svn-base         |    5 -
 .../SAML2XMLObjectAttributeEncoder.java.svn-base   |    5 -
 .../AbstractAttributeEncoder.java.svn-base         |   41 -
 .../AbstractSAML1AttributeEncoder.java.svn-base    |   63 -
 .../AbstractSAML2AttributeEncoder.java.svn-base    |   78 -
 .../AbstractScopedAttributeEncoder.java.svn-base   |  158 -
 .../SAML1Base64AttributeEncoder.java.svn-base      |   82 -
 ...SAML1ScopedStringAttributeEncoder.java.svn-base |   83 -
 .../SAML1StringAttributeEncoder.java.svn-base      |   80 -
 .../SAML1StringNameIdentifierEncoder.java.svn-base |   92 -
 .../SAML1XMLObjectAttributeEncoder.java.svn-base   |   74 -
 .../SAML2Base64AttributeEncoder.java.svn-base      |   81 -
 ...SAML2ScopedStringAttributeEncoder.java.svn-base |   98 -
 .../SAML2StringAttributeEncoder.java.svn-base      |   81 -
 .../SAML2StringNameIDEncoder.java.svn-base         |   89 -
 .../SAML2XMLObjectAttributeEncoder.java.svn-base   |   74 -
 .../common/attribute/filtering/.svn/all-wcprops    |   17 -
 .../common/attribute/filtering/.svn/entries        |   99 -
 .../AttributeFilteringEngine.java.svn-base         |    5 -
 .../AttributeFilteringException.java.svn-base      |    5 -
 .../AttributeFilteringEngine.java.svn-base         |   46 -
 .../AttributeFilteringException.java.svn-base      |   62 -
 .../attribute/filtering/provider/.svn/all-wcprops  |   41 -
 .../attribute/filtering/provider/.svn/entries      |  235 -
 .../prop-base/AttributeFilterPolicy.java.svn-base  |    5 -
 .../.svn/prop-base/AttributeRule.java.svn-base     |    5 -
 .../FilterProcessingException.java.svn-base        |    5 -
 .../.svn/prop-base/MatchFunctor.java.svn-base      |    5 -
 ...hibbolethAttributeFilteringEngine.java.svn-base |    5 -
 .../ShibbolethFilteringContext.java.svn-base       |    5 -
 .../text-base/AttributeFilterPolicy.java.svn-base  |   82 -
 .../.svn/text-base/AttributeRule.java.svn-base     |   87 -
 .../FilterProcessingException.java.svn-base        |   64 -
 .../.svn/text-base/MatchFunctor.java.svn-base      |   66 -
 ...hibbolethAttributeFilteringEngine.java.svn-base |  252 -
 .../ShibbolethFilteringContext.java.svn-base       |  119 -
 .../filtering/provider/match/.svn/all-wcprops      |    5 -
 .../filtering/provider/match/.svn/entries          |   34 -
 .../provider/match/basic/.svn/all-wcprops          |  143 -
 .../filtering/provider/match/basic/.svn/entries    |  810 ---
 ...ttributeTargetedRegexMatchFunctor.java.svn-base |    5 -
 ...tributeTargetedStringMatchFunctor.java.svn-base |    5 -
 .../prop-base/AbstractMatchFunctor.java.svn-base   |    5 -
 .../AbstractRegexMatchFunctor.java.svn-base        |    5 -
 .../AbstractStringMatchFunctor.java.svn-base       |    5 -
 .../.svn/prop-base/AndMatchFunctor.java.svn-base   |    5 -
 .../.svn/prop-base/AnyMatchFunctor.java.svn-base   |    5 -
 .../AttributeIssuerRegexMatchFunctor.java.svn-base |    5 -
 ...AttributeIssuerStringMatchFunctor.java.svn-base |    5 -
 ...tributeRequesterRegexMatchFunctor.java.svn-base |    5 -
 ...ributeRequesterStringMatchFunctor.java.svn-base |    5 -
 .../AttributeScopeRegexMatchFunctor.java.svn-base  |    5 -
 .../AttributeScopeStringMatchFunctor.java.svn-base |    5 -
 .../AttributeValueRegexMatchFunctor.java.svn-base  |    5 -
 .../AttributeValueStringMatchFunctor.java.svn-base |    5 -
 ...enticationMethodRegexMatchFunctor.java.svn-base |    5 -
 ...nticationMethodStringMatchFunctor.java.svn-base |    5 -
 .../.svn/prop-base/NotMatchFunctor.java.svn-base   |    5 -
 .../NumOfAttributeValuesMatchFunctor.java.svn-base |    5 -
 .../.svn/prop-base/OrMatchFunctor.java.svn-base    |    5 -
 .../PrincipalRegexMatchFunctor.java.svn-base       |    5 -
 .../PrincipalStringMatchFunctor.java.svn-base      |    5 -
 .../prop-base/ScriptMatchFunctor.java.svn-base     |    5 -
 ...ttributeTargetedRegexMatchFunctor.java.svn-base |   47 -
 ...tributeTargetedStringMatchFunctor.java.svn-base |   47 -
 .../text-base/AbstractMatchFunctor.java.svn-base   |   75 -
 .../AbstractRegexMatchFunctor.java.svn-base        |   67 -
 .../AbstractStringMatchFunctor.java.svn-base       |   86 -
 .../.svn/text-base/AndMatchFunctor.java.svn-base   |   94 -
 .../.svn/text-base/AnyMatchFunctor.java.svn-base   |   39 -
 .../AttributeIssuerRegexMatchFunctor.java.svn-base |   39 -
 ...AttributeIssuerStringMatchFunctor.java.svn-base |   39 -
 ...tributeRequesterRegexMatchFunctor.java.svn-base |   39 -
 ...ributeRequesterStringMatchFunctor.java.svn-base |   39 -
 .../AttributeScopeRegexMatchFunctor.java.svn-base  |   79 -
 .../AttributeScopeStringMatchFunctor.java.svn-base |   79 -
 .../AttributeValueRegexMatchFunctor.java.svn-base  |   58 -
 .../AttributeValueStringMatchFunctor.java.svn-base |   58 -
 ...enticationMethodRegexMatchFunctor.java.svn-base |   39 -
 ...nticationMethodStringMatchFunctor.java.svn-base |   39 -
 .../.svn/text-base/NotMatchFunctor.java.svn-base   |   70 -
 .../NumOfAttributeValuesMatchFunctor.java.svn-base |   80 -
 .../.svn/text-base/OrMatchFunctor.java.svn-base    |   87 -
 .../PrincipalRegexMatchFunctor.java.svn-base       |   39 -
 .../PrincipalStringMatchFunctor.java.svn-base      |   39 -
 .../text-base/ScriptMatchFunctor.java.svn-base     |  145 -
 .../filtering/provider/match/saml/.svn/all-wcprops |   89 -
 .../filtering/provider/match/saml/.svn/entries     |  504 --
 ...tEntityAttributeExactMatchFunctor.java.svn-base |    5 -
 ...stractEntityAttributeMatchFunctor.java.svn-base |    5 -
 ...tEntityAttributeRegexMatchFunctor.java.svn-base |    5 -
 .../AbstractEntityGroupMatchFunctor.java.svn-base  |    5 -
 ...NameIDFormatSupportedMatchFunctor.java.svn-base |    5 -
 .../AttributeInMetadataMatchFunctor.java.svn-base  |    5 -
 ...rEntityAttributeExactMatchFunctor.java.svn-base |    5 -
 ...rEntityAttributeRegexMatchFunctor.java.svn-base |    5 -
 ...teIssuerInEntityGroupMatchFunctor.java.svn-base |    5 -
 ...suerNameIDFormatExactMatchFunctor.java.svn-base |    5 -
 ...rEntityAttributeExactMatchFunctor.java.svn-base |    5 -
 ...rEntityAttributeRegexMatchFunctor.java.svn-base |    5 -
 ...equesterInEntityGroupMatchFunctor.java.svn-base |    5 -
 ...sterNameIDFormatExactMatchFunctor.java.svn-base |    5 -
 ...tEntityAttributeExactMatchFunctor.java.svn-base |   53 -
 ...stractEntityAttributeMatchFunctor.java.svn-base |  217 -
 ...tEntityAttributeRegexMatchFunctor.java.svn-base |   57 -
 .../AbstractEntityGroupMatchFunctor.java.svn-base  |   91 -
 ...NameIDFormatSupportedMatchFunctor.java.svn-base |  109 -
 .../AttributeInMetadataMatchFunctor.java.svn-base  |  268 -
 ...rEntityAttributeExactMatchFunctor.java.svn-base |   34 -
 ...rEntityAttributeRegexMatchFunctor.java.svn-base |   34 -
 ...teIssuerInEntityGroupMatchFunctor.java.svn-base |   39 -
 ...suerNameIDFormatExactMatchFunctor.java.svn-base |   37 -
 ...rEntityAttributeExactMatchFunctor.java.svn-base |   34 -
 ...rEntityAttributeRegexMatchFunctor.java.svn-base |   34 -
 ...equesterInEntityGroupMatchFunctor.java.svn-base |   39 -
 ...sterNameIDFormatExactMatchFunctor.java.svn-base |   37 -
 .../common/attribute/provider/.svn/all-wcprops     |   41 -
 .../common/attribute/provider/.svn/entries         |  232 -
 .../.svn/prop-base/BasicAttribute.java.svn-base    |    5 -
 .../SAML1AttributeAuthority.java.svn-base          |    5 -
 .../SAML2AttributeAuthority.java.svn-base          |    5 -
 .../prop-base/ScopedAttributeValue.java.svn-base   |    5 -
 ...ShibbolethSAML1AttributeAuthority.java.svn-base |    5 -
 ...ShibbolethSAML2AttributeAuthority.java.svn-base |    5 -
 .../.svn/text-base/BasicAttribute.java.svn-base    |  131 -
 .../SAML1AttributeAuthority.java.svn-base          |   89 -
 .../SAML2AttributeAuthority.java.svn-base          |   89 -
 .../text-base/ScopedAttributeValue.java.svn-base   |   95 -
 ...ShibbolethSAML1AttributeAuthority.java.svn-base |  309 --
 ...ShibbolethSAML2AttributeAuthority.java.svn-base |  354 --
 .../common/attribute/resolver/.svn/all-wcprops     |   17 -
 .../common/attribute/resolver/.svn/entries         |   99 -
 .../AttributeResolutionException.java.svn-base     |    5 -
 .../.svn/prop-base/AttributeResolver.java.svn-base |    5 -
 .../AttributeResolutionException.java.svn-base     |   62 -
 .../.svn/text-base/AttributeResolver.java.svn-base |   52 -
 .../attribute/resolver/provider/.svn/all-wcprops   |   29 -
 .../attribute/resolver/provider/.svn/entries       |  173 -
 .../AbstractResolutionPlugIn.java.svn-base         |    5 -
 .../.svn/prop-base/ResolutionPlugIn.java.svn-base  |    5 -
 .../ShibbolethAttributeResolver.java.svn-base      |    5 -
 .../ShibbolethResolutionContext.java.svn-base      |    5 -
 .../AbstractResolutionPlugIn.java.svn-base         |  146 -
 .../.svn/text-base/ResolutionPlugIn.java.svn-base  |   62 -
 .../ShibbolethAttributeResolver.java.svn-base      |  549 --
 .../ShibbolethResolutionContext.java.svn-base      |   86 -
 .../provider/attributeDefinition/.svn/all-wcprops  |  113 -
 .../provider/attributeDefinition/.svn/entries      |  640 ---
 .../prop-base/AttributeDefinition.java.svn-base    |    5 -
 .../BaseAttributeDefinition.java.svn-base          |    5 -
 .../ContextualAttributeDefinition.java.svn-base    |    5 -
 ...ptoTransientIdAttributeDefinition.java.svn-base |    5 -
 .../MappedAttributeDefinition.java.svn-base        |    5 -
 .../PrescopedAttributeDefinition.java.svn-base     |    5 -
 ...palAuthenticationMethodDefinition.java.svn-base |    5 -
 .../PrincipalNameDefinition.java.svn-base          |    5 -
 .../RegexSplitAttributeDefinition.java.svn-base    |    5 -
 ...NameIdentifierAttributeDefinition.java.svn-base |    5 -
 .../SAML2NameIDAttributeDefinition.java.svn-base   |    5 -
 .../ScopedAttributeDefinition.java.svn-base        |    5 -
 .../ScriptedAttributeDefinition.java.svn-base      |    5 -
 .../SimpleAttributeDefinition.java.svn-base        |    5 -
 .../TemplateAttributeDefinition.java.svn-base      |    5 -
 .../TransientIdAttributeDefinition.java.svn-base   |    5 -
 .../.svn/prop-base/TransientIdEntry.java.svn-base  |    5 -
 .../.svn/prop-base/ValueMap.java.svn-base          |    5 -
 .../text-base/AttributeDefinition.java.svn-base    |   64 -
 .../BaseAttributeDefinition.java.svn-base          |  174 -
 .../ContextualAttributeDefinition.java.svn-base    |  103 -
 ...ptoTransientIdAttributeDefinition.java.svn-base |  120 -
 .../MappedAttributeDefinition.java.svn-base        |  180 -
 .../PrescopedAttributeDefinition.java.svn-base     |   94 -
 ...palAuthenticationMethodDefinition.java.svn-base |   49 -
 .../PrincipalNameDefinition.java.svn-base          |   49 -
 .../RegexSplitAttributeDefinition.java.svn-base    |   90 -
 ...NameIdentifierAttributeDefinition.java.svn-base |  140 -
 .../SAML2NameIDAttributeDefinition.java.svn-base   |  166 -
 .../ScopedAttributeDefinition.java.svn-base        |   82 -
 .../ScriptedAttributeDefinition.java.svn-base      |  200 -
 .../SimpleAttributeDefinition.java.svn-base        |   52 -
 .../TemplateAttributeDefinition.java.svn-base      |  198 -
 .../TransientIdAttributeDefinition.java.svn-base   |  162 -
 .../.svn/text-base/TransientIdEntry.java.svn-base  |   79 -
 .../.svn/text-base/ValueMap.java.svn-base          |  187 -
 .../provider/dataConnector/.svn/all-wcprops        |   89 -
 .../resolver/provider/dataConnector/.svn/entries   |  504 --
 .../.svn/prop-base/BaseDataConnector.java.svn-base |    5 -
 .../ComputedIDDataConnector.java.svn-base          |    5 -
 .../ContextualDataConnector.java.svn-base          |    5 -
 .../.svn/prop-base/DataConnector.java.svn-base     |    5 -
 .../.svn/prop-base/LdapDataConnector.java.svn-base |    5 -
 .../prop-base/LdapPoolEmptyStrategy.java.svn-base  |    5 -
 .../.svn/prop-base/LdapPoolStrategy.java.svn-base  |    5 -
 .../prop-base/LdapPoolVTStrategy.java.svn-base     |    5 -
 .../prop-base/RDBMSColumnDescriptor.java.svn-base  |    5 -
 .../prop-base/RDBMSDataConnector.java.svn-base     |    5 -
 .../prop-base/StaticDataConnector.java.svn-base    |    5 -
 .../prop-base/StoredIDDataConnector.java.svn-base  |    5 -
 .../.svn/prop-base/StoredIDStore.java.svn-base     |    5 -
 .../.svn/prop-base/TemplateEngine.java.svn-base    |    5 -
 .../.svn/text-base/BaseDataConnector.java.svn-base |   52 -
 .../ComputedIDDataConnector.java.svn-base          |  160 -
 .../ContextualDataConnector.java.svn-base          |   87 -
 .../.svn/text-base/DataConnector.java.svn-base     |   38 -
 .../.svn/text-base/LdapDataConnector.java.svn-base |  466 --
 .../text-base/LdapPoolEmptyStrategy.java.svn-base  |   99 -
 .../.svn/text-base/LdapPoolStrategy.java.svn-base  |   72 -
 .../text-base/LdapPoolVTStrategy.java.svn-base     |  118 -
 .../text-base/RDBMSColumnDescriptor.java.svn-base  |   81 -
 .../text-base/RDBMSDataConnector.java.svn-base     |  488 --
 .../text-base/StaticDataConnector.java.svn-base    |   58 -
 .../text-base/StoredIDDataConnector.java.svn-base  |  361 --
 .../.svn/text-base/StoredIDStore.java.svn-base     |  734 ---
 .../.svn/text-base/TemplateEngine.java.svn-base    |  194 -
 .../provider/principalConnector/.svn/all-wcprops   |   47 -
 .../provider/principalConnector/.svn/entries       |  266 -
 .../prop-base/BasePrincipalConnector.java.svn-base |    5 -
 .../ContextualPrincipalConnector.java.svn-base     |    5 -
 ...CryptoTransientPrincipalConnector.java.svn-base |    5 -
 .../DirectPrincipalConnector.java.svn-base         |    5 -
 .../prop-base/PrincipalConnector.java.svn-base     |    5 -
 .../StoredIDPrincipalConnector.java.svn-base       |    5 -
 .../TransientPrincipalConnector.java.svn-base      |    5 -
 .../text-base/BasePrincipalConnector.java.svn-base |   61 -
 .../ContextualPrincipalConnector.java.svn-base     |   81 -
 ...CryptoTransientPrincipalConnector.java.svn-base |  132 -
 .../DirectPrincipalConnector.java.svn-base         |   49 -
 .../text-base/PrincipalConnector.java.svn-base     |   46 -
 .../StoredIDPrincipalConnector.java.svn-base       |  189 -
 .../TransientPrincipalConnector.java.svn-base      |   96 -
 .../shibboleth/common/binding/.svn/all-wcprops     |    5 -
 .../shibboleth/common/binding/.svn/entries         |   31 -
 .../common/binding/security/.svn/all-wcprops       |   11 -
 .../common/binding/security/.svn/entries           |   62 -
 .../ShibbolethClientCertAuthRule.java.svn-base     |    5 -
 .../ShibbolethClientCertAuthRule.java.svn-base     |   65 -
 .../shibboleth/common/config/.svn/all-wcprops      |   41 -
 .../shibboleth/common/config/.svn/entries          |  253 -
 .../prop-base/BaseReloadableService.java.svn-base  |    5 -
 .../.svn/prop-base/BaseService.java.svn-base       |    5 -
 .../BaseSpringNamespaceHandler.java.svn-base       |    5 -
 .../prop-base/OpensamlConfigBean.java.svn-base     |    5 -
 .../SpringConfigurationUtils.java.svn-base         |    5 -
 .../prop-base/SpringDocumentLoader.java.svn-base   |    5 -
 .../text-base/BaseReloadableService.java.svn-base  |  202 -
 .../.svn/text-base/BaseService.java.svn-base       |  252 -
 .../BaseSpringNamespaceHandler.java.svn-base       |  190 -
 .../text-base/OpensamlConfigBean.java.svn-base     |   93 -
 .../SpringConfigurationUtils.java.svn-base         |  285 -
 .../text-base/SpringDocumentLoader.java.svn-base   |   94 -
 .../common/config/attribute/.svn/all-wcprops       |    5 -
 .../common/config/attribute/.svn/entries           |   40 -
 .../config/attribute/authority/.svn/all-wcprops    |   23 -
 .../common/config/attribute/authority/.svn/entries |  130 -
 ...ttributeAuthorityNamespaceHandler.java.svn-base |    5 -
 ...buteAuthorityBeanDefinitionParser.java.svn-base |    5 -
 ...buteAuthorityBeanDefinitionParser.java.svn-base |    5 -
 ...ttributeAuthorityNamespaceHandler.java.svn-base |   37 -
 ...buteAuthorityBeanDefinitionParser.java.svn-base |   51 -
 ...buteAuthorityBeanDefinitionParser.java.svn-base |   51 -
 .../config/attribute/encoding/.svn/all-wcprops     |   83 -
 .../common/config/attribute/encoding/.svn/entries  |  470 --
 .../AttributeEncoderNamespaceHandler.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...tifierEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...NameIDEncoderBeanDefinitionParser.java.svn-base |    5 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |    5 -
 .../AttributeEncoderNamespaceHandler.java.svn-base |   63 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   41 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   55 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   59 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   69 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   59 -
 ...tifierEncoderBeanDefinitionParser.java.svn-base |   55 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   63 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   67 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   74 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   67 -
 ...NameIDEncoderBeanDefinitionParser.java.svn-base |   53 -
 ...ributeEncoderBeanDefinitionParser.java.svn-base |   64 -
 .../config/attribute/filtering/.svn/all-wcprops    |   47 -
 .../common/config/attribute/filtering/.svn/entries |  269 -
 .../AttributeFilterNamespaceHandler.java.svn-base  |    5 -
 ...eFilterPolicyBeanDefinitionParser.java.svn-base |    5 -
 .../AttributeFilterPolicyFactoryBean.java.svn-base |    5 -
 ...erPolicyGroupBeanDefinitionParser.java.svn-base |    5 -
 ...AttributeRuleBeanDefinitionParser.java.svn-base |    5 -
 .../BaseFilterBeanDefinitionParser.java.svn-base   |    5 -
 ...lteringEngineBeanDefinitionParser.java.svn-base |    5 -
 .../AttributeFilterNamespaceHandler.java.svn-base  |   49 -
 ...eFilterPolicyBeanDefinitionParser.java.svn-base |  105 -
 .../AttributeFilterPolicyFactoryBean.java.svn-base |  109 -
 ...erPolicyGroupBeanDefinitionParser.java.svn-base |   83 -
 ...AttributeRuleBeanDefinitionParser.java.svn-base |   89 -
 .../BaseFilterBeanDefinitionParser.java.svn-base   |   91 -
 ...lteringEngineBeanDefinitionParser.java.svn-base |   57 -
 .../attribute/filtering/match/.svn/all-wcprops     |    5 -
 .../config/attribute/filtering/match/.svn/entries  |   34 -
 .../filtering/match/basic/.svn/all-wcprops         |  143 -
 .../attribute/filtering/match/basic/.svn/entries   |  810 ---
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...gMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...gMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...dMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...yMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...BasicMatchFunctorNamespaceHandler.java.svn-base |    5 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...sMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...rMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |    5 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |   37 -
 ...gMatchFunctorBeanDefinitionParser.java.svn-base |   37 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...gMatchFunctorBeanDefinitionParser.java.svn-base |   45 -
 ...dMatchFunctorBeanDefinitionParser.java.svn-base |   62 -
 ...yMatchFunctorBeanDefinitionParser.java.svn-base |   39 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...BasicMatchFunctorNamespaceHandler.java.svn-base |   86 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |   63 -
 ...sMatchFunctorBeanDefinitionParser.java.svn-base |   64 -
 ...rMatchFunctorBeanDefinitionParser.java.svn-base |   62 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...MatchFunctionBeanDefinitionParser.java.svn-base |   40 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |   59 -
 .../filtering/match/saml/.svn/all-wcprops          |   95 -
 .../attribute/filtering/match/saml/.svn/entries    |  538 --
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...eMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...pMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...dMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...aMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...pMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...pMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |    5 -
 .../SAMLMatchFunctorNamespaceHandler.java.svn-base |    5 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...eMatchFunctorBeanDefinitionParser.java.svn-base |   43 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...pMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...dMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...aMatchFunctorBeanDefinitionParser.java.svn-base |   61 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...pMatchFunctorBeanDefinitionParser.java.svn-base |   41 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...xMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 ...pMatchFunctorBeanDefinitionParser.java.svn-base |   41 -
 ...tMatchFunctorBeanDefinitionParser.java.svn-base |   38 -
 .../SAMLMatchFunctorNamespaceHandler.java.svn-base |   61 -
 .../config/attribute/resolver/.svn/all-wcprops     |   35 -
 .../common/config/attribute/resolver/.svn/entries  |  207 -
 ...olutionPlugInBeanDefinitionParser.java.svn-base |    5 -
 ...stractResolutionPluginFactoryBean.java.svn-base |    5 -
 ...ibuteResolverBeanDefinitionParser.java.svn-base |    5 -
 ...AttributeResolverNamespaceHandler.java.svn-base |    5 -
 ...ibuteResolverBeanDefinitionParser.java.svn-base |    5 -
 ...olutionPlugInBeanDefinitionParser.java.svn-base |  109 -
 ...stractResolutionPluginFactoryBean.java.svn-base |   71 -
 ...ibuteResolverBeanDefinitionParser.java.svn-base |   60 -
 ...AttributeResolverNamespaceHandler.java.svn-base |   41 -
 ...ibuteResolverBeanDefinitionParser.java.svn-base |   40 -
 .../resolver/attributeDefinition/.svn/all-wcprops  |  179 -
 .../resolver/attributeDefinition/.svn/entries      | 1014 ----
 ...tributeDefinitionNamespaceHandler.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...aseAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...tIdAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...pedAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...pedAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...hodAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...ameAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...litAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...ierAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...eIDAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...pedAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...tedAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...pleAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...ateAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |    5 -
 ...tIdAttributeDefinitionFactoryBean.java.svn-base |    5 -
 ...tributeDefinitionNamespaceHandler.java.svn-base |   71 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |  106 -
 ...aseAttributeDefinitionFactoryBean.java.svn-base |  167 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   60 -
 ...tIdAttributeDefinitionFactoryBean.java.svn-base |   83 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |  155 -
 ...pedAttributeDefinitionFactoryBean.java.svn-base |  114 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   57 -
 ...pedAttributeDefinitionFactoryBean.java.svn-base |   62 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   38 -
 ...hodAttributeDefinitionFactoryBean.java.svn-base |   39 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   36 -
 ...ameAttributeDefinitionFactoryBean.java.svn-base |   39 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   59 -
 ...litAttributeDefinitionFactoryBean.java.svn-base |   79 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   57 -
 ...ierAttributeDefinitionFactoryBean.java.svn-base |   82 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   58 -
 ...eIDAttributeDefinitionFactoryBean.java.svn-base |  105 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   56 -
 ...pedAttributeDefinitionFactoryBean.java.svn-base |   62 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   87 -
 ...tedAttributeDefinitionFactoryBean.java.svn-base |  121 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   36 -
 ...pleAttributeDefinitionFactoryBean.java.svn-base |   39 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   78 -
 ...ateAttributeDefinitionFactoryBean.java.svn-base |  112 -
 ...uteDefinitionBeanDefinitionParser.java.svn-base |   59 -
 ...tIdAttributeDefinitionFactoryBean.java.svn-base |   84 -
 .../resolver/dataConnector/.svn/all-wcprops        |   83 -
 .../attribute/resolver/dataConnector/.svn/entries  |  470 --
 ...DataConnectorBeanDefinitionParser.java.svn-base |    5 -
 .../BaseDataConnectorFactoryBean.java.svn-base     |    5 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |    5 -
 ...omputedIDDataConnectorFactoryBean.java.svn-base |    5 -
 .../DataConnectorNamespaceHandler.java.svn-base    |    5 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |    5 -
 .../LdapDataConnectorFactoryBean.java.svn-base     |    5 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |    5 -
 .../RDBMSDataConnectorFactoryBean.java.svn-base    |    5 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |    5 -
 .../StaticDataConnectorFactoryBean.java.svn-base   |    5 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |    5 -
 .../StoredIDDataConnectorBeanFactory.java.svn-base |    5 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |   64 -
 .../BaseDataConnectorFactoryBean.java.svn-base     |   65 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |   57 -
 ...omputedIDDataConnectorFactoryBean.java.svn-base |  102 -
 .../DataConnectorNamespaceHandler.java.svn-base    |   43 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |  450 --
 .../LdapDataConnectorFactoryBean.java.svn-base     |  678 ---
 ...DataConnectorBeanDefinitionParser.java.svn-base |  420 --
 .../RDBMSDataConnectorFactoryBean.java.svn-base    |  307 --
 ...DataConnectorBeanDefinitionParser.java.svn-base |   89 -
 .../StaticDataConnectorFactoryBean.java.svn-base   |   63 -
 ...DataConnectorBeanDefinitionParser.java.svn-base |  270 -
 .../StoredIDDataConnectorBeanFactory.java.svn-base |  144 -
 .../resolver/principalConnector/.svn/all-wcprops   |   71 -
 .../resolver/principalConnector/.svn/entries       |  402 --
 ...BasePrincipalConnectorFactoryBean.java.svn-base |    5 -
 ...cipalConnectrBeanDefinitionParser.java.svn-base |    5 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |    5 -
 ...ientPrincipalConnectorFactoryBean.java.svn-base |    5 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |    5 -
 ...rectPrincipalConnectorFactoryBean.java.svn-base |    5 -
 ...rincipalConnectorNamespaceHandler.java.svn-base |    5 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |    5 -
 ...edIDPrincipalConnectorFactoryBean.java.svn-base |    5 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |    5 -
 ...ientPrincipalConnectorFactoryBean.java.svn-base |    5 -
 ...BasePrincipalConnectorFactoryBean.java.svn-base |   64 -
 ...cipalConnectrBeanDefinitionParser.java.svn-base |   44 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |   51 -
 ...ientPrincipalConnectorFactoryBean.java.svn-base |   61 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |   36 -
 ...rectPrincipalConnectorFactoryBean.java.svn-base |   39 -
 ...rincipalConnectorNamespaceHandler.java.svn-base |   45 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |   60 -
 ...edIDPrincipalConnectorFactoryBean.java.svn-base |   84 -
 ...ipalConnectorBeanDefinitionParser.java.svn-base |   51 -
 ...ientPrincipalConnectorFactoryBean.java.svn-base |   63 -
 .../common/config/metadata/.svn/all-wcprops        |   95 -
 .../shibboleth/common/config/metadata/.svn/entries |  538 --
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...ityRoleFilterBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...taFilterChainBeanDefinitionParser.java.svn-base |    5 -
 .../MetadataNamespaceHandler.java.svn-base         |    5 -
 ...idUntilFilterBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |    5 -
 ...idationFilterBeanDefinitionParser.java.svn-base |    5 -
 ...idationFilterBeanDefinitionParser.java.svn-base |    5 -
 ...adataProviderBeanDefinitionParser.java.svn-base |   85 -
 ...adataProviderBeanDefinitionParser.java.svn-base |  195 -
 ...adataProviderBeanDefinitionParser.java.svn-base |   93 -
 ...adataProviderBeanDefinitionParser.java.svn-base |   54 -
 ...ityRoleFilterBeanDefinitionParser.java.svn-base |   76 -
 ...adataProviderBeanDefinitionParser.java.svn-base |   55 -
 ...adataProviderBeanDefinitionParser.java.svn-base |   55 -
 ...adataProviderBeanDefinitionParser.java.svn-base |  205 -
 ...adataProviderBeanDefinitionParser.java.svn-base |   56 -
 ...taFilterChainBeanDefinitionParser.java.svn-base |   57 -
 .../MetadataNamespaceHandler.java.svn-base         |   65 -
 ...idUntilFilterBeanDefinitionParser.java.svn-base |   55 -
 ...adataProviderBeanDefinitionParser.java.svn-base |   54 -
 ...idationFilterBeanDefinitionParser.java.svn-base |   63 -
 ...idationFilterBeanDefinitionParser.java.svn-base |   59 -
 .../common/config/profile/.svn/all-wcprops         |   29 -
 .../shibboleth/common/config/profile/.svn/entries  |  164 -
 ...rofileHandlerBeanDefinitionParser.java.svn-base |    5 -
 ...rofileHandlerBeanDefinitionParser.java.svn-base |    5 -
 ...PErrorHandlerBeanDefinitionParser.java.svn-base |    5 -
 ...yErrorHandlerBeanDefinitionParser.java.svn-base |    5 -
 ...rofileHandlerBeanDefinitionParser.java.svn-base |   71 -
 ...rofileHandlerBeanDefinitionParser.java.svn-base |   40 -
 ...PErrorHandlerBeanDefinitionParser.java.svn-base |   60 -
 ...yErrorHandlerBeanDefinitionParser.java.svn-base |   62 -
 .../common/config/relyingparty/.svn/all-wcprops    |   41 -
 .../common/config/relyingparty/.svn/entries        |  235 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 .../RelyingPartyFactoryBean.java.svn-base          |    5 -
 .../.svn/prop-base/RelyingPartyGroup.java.svn-base |    5 -
 ...ingPartyGroupBeanDefinitionParser.java.svn-base |    5 -
 .../RelyingPartyNamespaceHandler.java.svn-base     |    5 -
 ...rationManagerBeanDefinitionParser.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |  132 -
 .../RelyingPartyFactoryBean.java.svn-base          |  183 -
 .../.svn/text-base/RelyingPartyGroup.java.svn-base |  180 -
 ...ingPartyGroupBeanDefinitionParser.java.svn-base |  118 -
 .../RelyingPartyNamespaceHandler.java.svn-base     |   46 -
 ...rationManagerBeanDefinitionParser.java.svn-base |   41 -
 .../config/relyingparty/saml/.svn/all-wcprops      |  143 -
 .../common/config/relyingparty/saml/.svn/entries   |  810 ---
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...L1ProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...L2ProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...MLProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...onProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...ryProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...onProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...ryProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...CPProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...stProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...SOProfileConfigurationFactoryBean.java.svn-base |    5 -
 .../SAMLRelyingPartyNamespaceHandler.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |    5 -
 ...SOProfileConfigurationFactoryBean.java.svn-base |    5 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   38 -
 ...L1ProfileConfigurationFactoryBean.java.svn-base |   58 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   76 -
 ...L2ProfileConfigurationFactoryBean.java.svn-base |  153 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |  127 -
 ...MLProfileConfigurationFactoryBean.java.svn-base |  240 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   50 -
 ...onProfileConfigurationFactoryBean.java.svn-base |   40 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   50 -
 ...ryProfileConfigurationFactoryBean.java.svn-base |   40 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   50 -
 ...onProfileConfigurationFactoryBean.java.svn-base |   41 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   50 -
 ...ryProfileConfigurationFactoryBean.java.svn-base |   40 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   45 -
 ...CPProfileConfigurationFactoryBean.java.svn-base |   69 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   50 -
 ...stProfileConfigurationFactoryBean.java.svn-base |   40 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   78 -
 ...SOProfileConfigurationFactoryBean.java.svn-base |  103 -
 .../SAMLRelyingPartyNamespaceHandler.java.svn-base |   57 -
 ...ConfigurationBeanDefinitionParser.java.svn-base |   64 -
 ...SOProfileConfigurationFactoryBean.java.svn-base |   61 -
 .../common/config/resource/.svn/all-wcprops        |   59 -
 .../shibboleth/common/config/resource/.svn/entries |  334 --
 ...tractResourceBeanDefinitionParser.java.svn-base |    5 -
 ...esourceFilterBeanDefinitionParser.java.svn-base |    5 -
 ...spathResourceBeanDefinitionParser.java.svn-base |    5 -
 ...dHttpResourceBeanDefinitionParser.java.svn-base |    5 -
 ...ystemResourceBeanDefinitionParser.java.svn-base |    5 -
 .../HttpResourceBeanDefinitionParser.java.svn-base |    5 -
 ...esourceFilterBeanDefinitionParser.java.svn-base |    5 -
 .../ResourceNamespaceHandler.java.svn-base         |    5 -
 .../SVNResourceBeanDefinitionParser.java.svn-base  |    5 -
 ...tractResourceBeanDefinitionParser.java.svn-base |   43 -
 ...esourceFilterBeanDefinitionParser.java.svn-base |   60 -
 ...spathResourceBeanDefinitionParser.java.svn-base |   51 -
 ...dHttpResourceBeanDefinitionParser.java.svn-base |   75 -
 ...ystemResourceBeanDefinitionParser.java.svn-base |   72 -
 .../HttpResourceBeanDefinitionParser.java.svn-base |   51 -
 ...esourceFilterBeanDefinitionParser.java.svn-base |   59 -
 .../ResourceNamespaceHandler.java.svn-base         |   53 -
 .../SVNResourceBeanDefinitionParser.java.svn-base  |  507 --
 .../common/config/security/.svn/all-wcprops        |  251 -
 .../shibboleth/common/config/security/.svn/entries | 1425 -----
 ...sicCredentialBeanDefinitionParser.java.svn-base |    5 -
 ...actCredentialBeanDefinitionParser.java.svn-base |    5 -
 .../AbstractCredentialFactoryBean.java.svn-base    |    5 -
 ...onInformationBeanDefinitionParser.java.svn-base |    5 -
 ...509CredentialBeanDefinitionParser.java.svn-base |    5 -
 .../BasicCredentialFactoryBean.java.svn-base       |    5 -
 ...dationOptionsBeanDefinitionParser.java.svn-base |    5 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...ngSignatureTrustEngineFactoryBean.java.svn-base |    5 -
 ...ngTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 .../ChainingTrustEngineFactoryBean.java.svn-base   |    5 -
 ...tCertAuthRuleBeanDefinitionParser.java.svn-base |    5 -
 ...sicCredentialBeanDefinitionParser.java.svn-base |    5 -
 ...onInformationBeanDefinitionParser.java.svn-base |    5 -
 ...509CredentialBeanDefinitionParser.java.svn-base |    5 -
 ...sicCredentialBeanDefinitionParser.java.svn-base |    5 -
 ...onInformationBeanDefinitionParser.java.svn-base |    5 -
 ...509CredentialBeanDefinitionParser.java.svn-base |    5 -
 ...nticationRuleBeanDefinitionParser.java.svn-base |    5 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...eySignatureTrustEngineFactoryBean.java.svn-base |    5 -
 ...eyTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...ExplicitKeyTrustEngineFactoryBean.java.svn-base |    5 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...IXSignatureTrustEngineFactoryBean.java.svn-base |    5 -
 ...alTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...9CredentialTrustEngineFactoryBean.java.svn-base |    5 -
 ...XValidationInformationFactoryBean.java.svn-base |    5 -
 ...dationOptionsBeanDefinitionParser.java.svn-base |    5 -
 .../SecurityNamespaceHandler.java.svn-base         |    5 -
 ...ecurityPolicyBeanDefinitionParser.java.svn-base |    5 -
 ...ibbolethSecurityPolicyFactoryBean.java.svn-base |    5 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...eySignatureTrustEngineFactoryBean.java.svn-base |    5 -
 ...eyTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...ExplicitKeyTrustEngineFactoryBean.java.svn-base |    5 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...IXSignatureTrustEngineFactoryBean.java.svn-base |    5 -
 ...alTrustEngineBeanDefinitionParser.java.svn-base |    5 -
 ...9CredentialTrustEngineFactoryBean.java.svn-base |    5 -
 .../X509CredentialFactoryBean.java.svn-base        |    5 -
 ...sicCredentialBeanDefinitionParser.java.svn-base |  143 -
 ...actCredentialBeanDefinitionParser.java.svn-base |  146 -
 .../AbstractCredentialFactoryBean.java.svn-base    |   92 -
 ...onInformationBeanDefinitionParser.java.svn-base |  161 -
 ...509CredentialBeanDefinitionParser.java.svn-base |  177 -
 .../BasicCredentialFactoryBean.java.svn-base       |  145 -
 ...dationOptionsBeanDefinitionParser.java.svn-base |   83 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |   89 -
 ...ngSignatureTrustEngineFactoryBean.java.svn-base |   67 -
 ...ngTrustEngineBeanDefinitionParser.java.svn-base |   89 -
 .../ChainingTrustEngineFactoryBean.java.svn-base   |   66 -
 ...tCertAuthRuleBeanDefinitionParser.java.svn-base |   62 -
 ...sicCredentialBeanDefinitionParser.java.svn-base |   71 -
 ...onInformationBeanDefinitionParser.java.svn-base |   60 -
 ...509CredentialBeanDefinitionParser.java.svn-base |   70 -
 ...sicCredentialBeanDefinitionParser.java.svn-base |   45 -
 ...onInformationBeanDefinitionParser.java.svn-base |   41 -
 ...509CredentialBeanDefinitionParser.java.svn-base |   44 -
 ...nticationRuleBeanDefinitionParser.java.svn-base |   50 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |   61 -
 ...eySignatureTrustEngineFactoryBean.java.svn-base |   79 -
 ...eyTrustEngineBeanDefinitionParser.java.svn-base |   59 -
 ...ExplicitKeyTrustEngineFactoryBean.java.svn-base |   63 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |   69 -
 ...IXSignatureTrustEngineFactoryBean.java.svn-base |  108 -
 ...alTrustEngineBeanDefinitionParser.java.svn-base |   69 -
 ...9CredentialTrustEngineFactoryBean.java.svn-base |   94 -
 ...XValidationInformationFactoryBean.java.svn-base |  117 -
 ...dationOptionsBeanDefinitionParser.java.svn-base |   73 -
 .../SecurityNamespaceHandler.java.svn-base         |  100 -
 ...ecurityPolicyBeanDefinitionParser.java.svn-base |   69 -
 ...ibbolethSecurityPolicyFactoryBean.java.svn-base |   88 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |   65 -
 ...eySignatureTrustEngineFactoryBean.java.svn-base |   77 -
 ...eyTrustEngineBeanDefinitionParser.java.svn-base |   65 -
 ...ExplicitKeyTrustEngineFactoryBean.java.svn-base |   64 -
 ...reTrustEngineBeanDefinitionParser.java.svn-base |   78 -
 ...IXSignatureTrustEngineFactoryBean.java.svn-base |  135 -
 ...alTrustEngineBeanDefinitionParser.java.svn-base |   78 -
 ...9CredentialTrustEngineFactoryBean.java.svn-base |  122 -
 .../X509CredentialFactoryBean.java.svn-base        |  178 -
 .../common/config/security/saml/.svn/all-wcprops   |   53 -
 .../common/config/security/saml/.svn/entries       |  300 -
 ...ueInstantRuleBeanDefinitionParser.java.svn-base |    5 -
 ...oryIssuerRuleBeanDefinitionParser.java.svn-base |    5 -
 ...ageReplayRuleBeanDefinitionParser.java.svn-base |    5 -
 ...stsSignedRuleBeanDefinitionParser.java.svn-base |    5 -
 ...impleSignRuleBeanDefinitionParser.java.svn-base |    5 -
 ...SignatureRuleBeanDefinitionParser.java.svn-base |    5 -
 ...ecurityPolicyBeanDefinitionParser.java.svn-base |    5 -
 .../SAMLSecurityNamespaceHandler.java.svn-base     |    5 -
 ...ueInstantRuleBeanDefinitionParser.java.svn-base |   72 -
 ...oryIssuerRuleBeanDefinitionParser.java.svn-base |   49 -
 ...ageReplayRuleBeanDefinitionParser.java.svn-base |   60 -
 ...stsSignedRuleBeanDefinitionParser.java.svn-base |   49 -
 ...impleSignRuleBeanDefinitionParser.java.svn-base |   68 -
 ...SignatureRuleBeanDefinitionParser.java.svn-base |   51 -
 ...ecurityPolicyBeanDefinitionParser.java.svn-base |   51 -
 .../SAMLSecurityNamespaceHandler.java.svn-base     |   53 -
 .../common/config/service/.svn/all-wcprops         |   41 -
 .../shibboleth/common/config/service/.svn/entries  |  232 -
 ...adableServiceBeanDefinitionParser.java.svn-base |    5 -
 ...stractServiceBeanDefinitionParser.java.svn-base |    5 -
 .../ServiceNamespaceHandler.java.svn-base          |    5 -
 .../ServicesBeanDefinitionParser.java.svn-base     |    5 -
 .../ServletContextAttributeExporter.java.svn-base  |    5 -
 ...ibuteExporterBeanDefinitionParser.java.svn-base |    5 -
 ...adableServiceBeanDefinitionParser.java.svn-base |   63 -
 ...stractServiceBeanDefinitionParser.java.svn-base |   65 -
 .../ServiceNamespaceHandler.java.svn-base          |   37 -
 .../ServicesBeanDefinitionParser.java.svn-base     |   45 -
 .../ServletContextAttributeExporter.java.svn-base  |  115 -
 ...ibuteExporterBeanDefinitionParser.java.svn-base |   60 -
 .../shibboleth/common/log/.svn/all-wcprops         |   35 -
 .../middleware/shibboleth/common/log/.svn/entries  |  198 -
 .../.svn/prop-base/AccessLogEntry.java.svn-base    |    5 -
 .../log/.svn/prop-base/AuditLogEntry.java.svn-base |    5 -
 ...ogbackConfigurationChangeListener.java.svn-base |    5 -
 .../prop-base/LogbackLoggingService.java.svn-base  |    5 -
 .../prop-base/SLF4JMDCCleanupFilter.java.svn-base  |    5 -
 .../.svn/text-base/AccessLogEntry.java.svn-base    |  150 -
 .../log/.svn/text-base/AuditLogEntry.java.svn-base |  328 --
 ...ogbackConfigurationChangeListener.java.svn-base |   76 -
 .../text-base/LogbackLoggingService.java.svn-base  |   62 -
 .../text-base/SLF4JMDCCleanupFilter.java.svn-base  |   59 -
 .../shibboleth/common/profile/.svn/all-wcprops     |   47 -
 .../shibboleth/common/profile/.svn/entries         |  269 -
 .../prop-base/AbstractErrorHandler.java.svn-base   |    5 -
 .../NoProfileHandlerException.java.svn-base        |    5 -
 .../.svn/prop-base/ProfileException.java.svn-base  |    5 -
 .../.svn/prop-base/ProfileHandler.java.svn-base    |    5 -
 .../prop-base/ProfileHandlerManager.java.svn-base  |    5 -
 .../prop-base/ProfileRequestContext.java.svn-base  |    5 -
 .../ProfileRequestDispatcherServlet.java.svn-base  |    5 -
 .../text-base/AbstractErrorHandler.java.svn-base   |   36 -
 .../NoProfileHandlerException.java.svn-base        |   62 -
 .../.svn/text-base/ProfileException.java.svn-base  |   62 -
 .../.svn/text-base/ProfileHandler.java.svn-base    |   41 -
 .../text-base/ProfileHandlerManager.java.svn-base  |   44 -
 .../text-base/ProfileRequestContext.java.svn-base  |   90 -
 .../ProfileRequestDispatcherServlet.java.svn-base  |   99 -
 .../common/profile/provider/.svn/all-wcprops       |   41 -
 .../common/profile/provider/.svn/entries           |  232 -
 ...actRequestURIMappedProfileHandler.java.svn-base |    5 -
 .../AbstractShibbolethProfileHandler.java.svn-base |    5 -
 .../BaseSAMLProfileRequestContext.java.svn-base    |    5 -
 .../.svn/prop-base/JSPErrorHandler.java.svn-base   |    5 -
 .../SAMLProfileRequestContext.java.svn-base        |    5 -
 .../prop-base/VelocityErrorHandler.java.svn-base   |    5 -
 ...actRequestURIMappedProfileHandler.java.svn-base |   62 -
 .../AbstractShibbolethProfileHandler.java.svn-base |  192 -
 .../BaseSAMLProfileRequestContext.java.svn-base    |  215 -
 .../.svn/text-base/JSPErrorHandler.java.svn-base   |   90 -
 .../SAMLProfileRequestContext.java.svn-base        |   39 -
 .../text-base/VelocityErrorHandler.java.svn-base   |  111 -
 .../common/relyingparty/.svn/all-wcprops           |   29 -
 .../shibboleth/common/relyingparty/.svn/entries    |  167 -
 .../prop-base/ProfileConfiguration.java.svn-base   |    5 -
 .../RelyingPartyConfiguration.java.svn-base        |    5 -
 .../RelyingPartyConfigurationManager.java.svn-base |    5 -
 ...elyingPartySecurityPolicyResolver.java.svn-base |    5 -
 .../text-base/ProfileConfiguration.java.svn-base   |   40 -
 .../RelyingPartyConfiguration.java.svn-base        |  187 -
 .../RelyingPartyConfigurationManager.java.svn-base |   56 -
 ...elyingPartySecurityPolicyResolver.java.svn-base |   82 -
 .../common/relyingparty/provider/.svn/all-wcprops  |   23 -
 .../common/relyingparty/provider/.svn/entries      |  136 -
 .../AbstractSAMLProfileConfiguration.java.svn-base |    5 -
 .../CryptoOperationRequirementLevel.java.svn-base  |    5 -
 ...DRelyingPartyConfigurationManager.java.svn-base |    5 -
 .../AbstractSAMLProfileConfiguration.java.svn-base |  228 -
 .../CryptoOperationRequirementLevel.java.svn-base  |   30 -
 ...DRelyingPartyConfigurationManager.java.svn-base |  201 -
 .../relyingparty/provider/saml1/.svn/all-wcprops   |   29 -
 .../relyingparty/provider/saml1/.svn/entries       |  164 -
 ...AbstractSAML1ProfileConfiguration.java.svn-base |    5 -
 .../ArtifactResolutionConfiguration.java.svn-base  |    5 -
 .../AttributeQueryConfiguration.java.svn-base      |    5 -
 .../ShibbolethSSOConfiguration.java.svn-base       |    5 -
 ...AbstractSAML1ProfileConfiguration.java.svn-base |   48 -
 .../ArtifactResolutionConfiguration.java.svn-base  |   32 -
 .../AttributeQueryConfiguration.java.svn-base      |   32 -
 .../ShibbolethSSOConfiguration.java.svn-base       |   53 -
 .../relyingparty/provider/saml2/.svn/all-wcprops   |   41 -
 .../relyingparty/provider/saml2/.svn/entries       |  232 -
 ...AbstractSAML2ProfileConfiguration.java.svn-base |    5 -
 .../ArtifactResolutionConfiguration.java.svn-base  |    5 -
 .../AttributeQueryConfiguration.java.svn-base      |    5 -
 .../.svn/prop-base/ECPConfiguration.java.svn-base  |    5 -
 .../LogoutRequestConfiguration.java.svn-base       |    5 -
 .../.svn/prop-base/SSOConfiguration.java.svn-base  |    5 -
 ...AbstractSAML2ProfileConfiguration.java.svn-base |  133 -
 .../ArtifactResolutionConfiguration.java.svn-base  |   32 -
 .../AttributeQueryConfiguration.java.svn-base      |   32 -
 .../.svn/text-base/ECPConfiguration.java.svn-base  |   32 -
 .../LogoutRequestConfiguration.java.svn-base       |   32 -
 .../.svn/text-base/SSOConfiguration.java.svn-base  |   97 -
 .../shibboleth/common/resource/.svn/all-wcprops    |   17 -
 .../shibboleth/common/resource/.svn/entries        |   96 -
 .../SVNBasicAuthenticationManager.java.svn-base    |    5 -
 .../.svn/prop-base/SVNResource.java.svn-base       |    5 -
 .../SVNBasicAuthenticationManager.java.svn-base    |  270 -
 .../.svn/text-base/SVNResource.java.svn-base       |  356 --
 .../shibboleth/common/security/.svn/all-wcprops    |   17 -
 .../shibboleth/common/security/.svn/entries        |   96 -
 ...PKIXValidationInformationResolver.java.svn-base |    5 -
 .../ShibbolethSecurityPolicy.java.svn-base         |    5 -
 ...PKIXValidationInformationResolver.java.svn-base |  811 ---
 .../ShibbolethSecurityPolicy.java.svn-base         |   49 -
 .../shibboleth/common/service/.svn/all-wcprops     |   23 -
 .../shibboleth/common/service/.svn/entries         |  130 -
 .../.svn/prop-base/ReloadableService.java.svn-base |    5 -
 .../service/.svn/prop-base/Service.java.svn-base   |    5 -
 .../.svn/prop-base/ServiceException.java.svn-base  |    5 -
 .../.svn/text-base/ReloadableService.java.svn-base |   32 -
 .../service/.svn/text-base/Service.java.svn-base   |   61 -
 .../.svn/text-base/ServiceException.java.svn-base  |   62 -
 .../shibboleth/common/session/.svn/all-wcprops     |   29 -
 .../shibboleth/common/session/.svn/entries         |  167 -
 .../.svn/prop-base/LoginEvent.java.svn-base        |    5 -
 .../.svn/prop-base/LogoutEvent.java.svn-base       |    5 -
 .../session/.svn/prop-base/Session.java.svn-base   |    5 -
 .../.svn/prop-base/SessionManager.java.svn-base    |    5 -
 .../.svn/text-base/LoginEvent.java.svn-base        |   45 -
 .../.svn/text-base/LogoutEvent.java.svn-base       |   48 -
 .../session/.svn/text-base/Session.java.svn-base   |   77 -
 .../.svn/text-base/SessionManager.java.svn-base    |   90 -
 .../common/session/impl/.svn/all-wcprops           |   11 -
 .../shibboleth/common/session/impl/.svn/entries    |   62 -
 .../.svn/prop-base/AbstractSession.java.svn-base   |    5 -
 .../.svn/text-base/AbstractSession.java.svn-base   |  100 -
 .../shibboleth/common/util/.svn/all-wcprops        |   59 -
 .../middleware/shibboleth/common/util/.svn/entries |  334 --
 .../util/.svn/prop-base/Base32.java.svn-base       |    5 -
 .../prop-base/DataExpiredException.java.svn-base   |    5 -
 .../util/.svn/prop-base/DataSealer.java.svn-base   |    5 -
 .../prop-base/DataSealerException.java.svn-base    |    5 -
 .../EventingMapBasedStorageService.java.svn-base   |    5 -
 .../util/.svn/prop-base/HttpHelper.java.svn-base   |    5 -
 .../.svn/prop-base/Slf4JLogChute.java.svn-base     |    5 -
 .../prop-base/StringResourceLoader.java.svn-base   |    5 -
 ...tyStringResourceRepositoryAdaptor.java.svn-base |    5 -
 .../util/.svn/text-base/Base32.java.svn-base       |  288 -
 .../text-base/DataExpiredException.java.svn-base   |   59 -
 .../util/.svn/text-base/DataSealer.java.svn-base   |  565 --
 .../text-base/DataSealerException.java.svn-base    |   62 -
 .../EventingMapBasedStorageService.java.svn-base   |  360 --
 .../util/.svn/text-base/HttpHelper.java.svn-base   |   49 -
 .../.svn/text-base/Slf4JLogChute.java.svn-base     |  124 -
 .../text-base/StringResourceLoader.java.svn-base   |  348 --
 ...tyStringResourceRepositoryAdaptor.java.svn-base |   86 -
 .../shibboleth/common/xmlobject/.svn/all-wcprops   |   23 -
 .../shibboleth/common/xmlobject/.svn/entries       |  133 -
 .../ShibbolethMetadataKeyAuthority.java.svn-base   |    5 -
 .../ShibbolethMetadataScope.java.svn-base          |    5 -
 .../prop-base/ShibbolethScopedValue.java.svn-base  |    5 -
 .../ShibbolethMetadataKeyAuthority.java.svn-base   |   67 -
 .../ShibbolethMetadataScope.java.svn-base          |   81 -
 .../text-base/ShibbolethScopedValue.java.svn-base  |   79 -
 .../common/xmlobject/impl/.svn/all-wcprops         |   77 -
 .../shibboleth/common/xmlobject/impl/.svn/entries  |  436 --
 ...bolethMetadataKeyAuthorityBuilder.java.svn-base |    5 -
 ...hibbolethMetadataKeyAuthorityImpl.java.svn-base |    5 -
 ...ethMetadataKeyAuthorityMarshaller.java.svn-base |    5 -
 ...hMetadataKeyAuthorityUnmarshaller.java.svn-base |    5 -
 .../ShibbolethMetadataScopeBuilder.java.svn-base   |    5 -
 .../ShibbolethMetadataScopeImpl.java.svn-base      |    5 -
 ...ShibbolethMetadataScopeMarshaller.java.svn-base |    5 -
 ...ibbolethMetadataScopeUnmarshaller.java.svn-base |    5 -
 .../ShibbolethScopedValueBuilder.java.svn-base     |    5 -
 .../ShibbolethScopedValueImpl.java.svn-base        |    5 -
 .../ShibbolethScopedValueMarshaller.java.svn-base  |    5 -
 ...ShibbolethScopedValueUnmarshaller.java.svn-base |    5 -
 ...bolethMetadataKeyAuthorityBuilder.java.svn-base |   46 -
 ...hibbolethMetadataKeyAuthorityImpl.java.svn-base |   90 -
 ...ethMetadataKeyAuthorityMarshaller.java.svn-base |   83 -
 ...hMetadataKeyAuthorityUnmarshaller.java.svn-base |   74 -
 .../ShibbolethMetadataScopeBuilder.java.svn-base   |   45 -
 .../ShibbolethMetadataScopeImpl.java.svn-base      |  102 -
 ...ShibbolethMetadataScopeMarshaller.java.svn-base |   67 -
 ...ibbolethMetadataScopeUnmarshaller.java.svn-base |   61 -
 .../ShibbolethScopedValueBuilder.java.svn-base     |   34 -
 .../ShibbolethScopedValueImpl.java.svn-base        |   92 -
 .../ShibbolethScopedValueMarshaller.java.svn-base  |   49 -
 ...ShibbolethScopedValueUnmarshaller.java.svn-base |   56 -
 src/main/resources/.svn/all-wcprops                |   11 -
 src/main/resources/.svn/entries                    |   68 -
 .../shibboleth-saml-ext-config.xml.svn-base        |    9 -
 .../shibboleth-saml-ext-config.xml.svn-base        |   28 -
 src/main/resources/META-INF/.svn/all-wcprops       |   17 -
 src/main/resources/META-INF/.svn/entries           |   96 -
 .../.svn/text-base/spring.handlers.svn-base        |   16 -
 .../.svn/text-base/spring.schemas.svn-base         |   16 -
 src/main/resources/schema/.svn/all-wcprops         |  119 -
 src/main/resources/schema/.svn/entries             |  674 ---
 .../shibboleth-2.0-afp-mf-basic.xsd.svn-base       |    9 -
 .../shibboleth-2.0-afp-mf-saml.xsd.svn-base        |    9 -
 .../.svn/prop-base/shibboleth-2.0-afp.xsd.svn-base |    9 -
 ...shibboleth-2.0-attribute-authority.xsd.svn-base |    9 -
 .../shibboleth-2.0-attribute-encoder.xsd.svn-base  |    9 -
 .../shibboleth-2.0-attribute-map.xsd.svn-base      |    9 -
 ...ibboleth-2.0-attribute-resolver-ad.xsd.svn-base |    9 -
 ...ibboleth-2.0-attribute-resolver-dc.xsd.svn-base |    9 -
 ...ibboleth-2.0-attribute-resolver-pc.xsd.svn-base |    9 -
 .../shibboleth-2.0-attribute-resolver.xsd.svn-base |    9 -
 .../prop-base/shibboleth-2.0-metadata.xsd.svn-base |    9 -
 .../shibboleth-2.0-profile-handler.xsd.svn-base    |    9 -
 .../shibboleth-2.0-relying-party-saml.xsd.svn-base |    9 -
 .../shibboleth-2.0-relying-party.xsd.svn-base      |    9 -
 .../prop-base/shibboleth-2.0-resource.xsd.svn-base |    9 -
 ...hibboleth-2.0-security-policy-saml.xsd.svn-base |    9 -
 .../prop-base/shibboleth-2.0-security.xsd.svn-base |    9 -
 .../prop-base/shibboleth-2.0-services.xsd.svn-base |    9 -
 .../prop-base/shibboleth-metadata-1.0.xsd.svn-base |    9 -
 .../shibboleth-2.0-afp-mf-basic.xsd.svn-base       |  361 --
 .../shibboleth-2.0-afp-mf-saml.xsd.svn-base        |  220 -
 .../.svn/text-base/shibboleth-2.0-afp.xsd.svn-base |  211 -
 ...shibboleth-2.0-attribute-authority.xsd.svn-base |   46 -
 .../shibboleth-2.0-attribute-encoder.xsd.svn-base  |  229 -
 .../shibboleth-2.0-attribute-map.xsd.svn-base      |   77 -
 ...ibboleth-2.0-attribute-resolver-ad.xsd.svn-base |  332 --
 ...ibboleth-2.0-attribute-resolver-dc.xsd.svn-base |  739 ---
 ...ibboleth-2.0-attribute-resolver-pc.xsd.svn-base |   82 -
 .../shibboleth-2.0-attribute-resolver.xsd.svn-base |  224 -
 .../text-base/shibboleth-2.0-metadata.xsd.svn-base |  441 --
 .../shibboleth-2.0-profile-handler.xsd.svn-base    |  132 -
 .../shibboleth-2.0-relying-party-saml.xsd.svn-base |  335 --
 .../shibboleth-2.0-relying-party.xsd.svn-base      |  141 -
 .../text-base/shibboleth-2.0-resource.xsd.svn-base |  126 -
 ...hibboleth-2.0-security-policy-saml.xsd.svn-base |  157 -
 .../text-base/shibboleth-2.0-security.xsd.svn-base |  755 ---
 .../text-base/shibboleth-2.0-services.xsd.svn-base |  102 -
 .../text-base/shibboleth-metadata-1.0.xsd.svn-base |   37 -
 src/test/.svn/all-wcprops                          |    5 -
 src/test/.svn/entries                              |   34 -
 src/test/java/.svn/all-wcprops                     |    5 -
 src/test/java/.svn/entries                         |   31 -
 src/test/java/edu/.svn/all-wcprops                 |    5 -
 src/test/java/edu/.svn/entries                     |   31 -
 src/test/java/edu/internet2/.svn/all-wcprops       |    5 -
 src/test/java/edu/internet2/.svn/entries           |   31 -
 .../java/edu/internet2/middleware/.svn/all-wcprops |    5 -
 .../java/edu/internet2/middleware/.svn/entries     |   31 -
 .../middleware/shibboleth/.svn/all-wcprops         |    5 -
 .../internet2/middleware/shibboleth/.svn/entries   |   31 -
 .../middleware/shibboleth/common/.svn/all-wcprops  |   17 -
 .../middleware/shibboleth/common/.svn/entries      |  117 -
 .../.svn/prop-base/ShibTestBootstrap.java.svn-base |    5 -
 .../.svn/prop-base/TestCaseBase.java.svn-base      |    5 -
 .../.svn/text-base/ShibTestBootstrap.java.svn-base |   36 -
 .../.svn/text-base/TestCaseBase.java.svn-base      |  145 -
 .../shibboleth/common/attribute/.svn/all-wcprops   |    5 -
 .../shibboleth/common/attribute/.svn/entries       |   34 -
 .../common/attribute/filtering/.svn/all-wcprops    |    5 -
 .../common/attribute/filtering/.svn/entries        |   31 -
 .../attribute/filtering/provider/.svn/all-wcprops  |   11 -
 .../attribute/filtering/provider/.svn/entries      |   65 -
 ...olethAttributeFilteringEngineTest.java.svn-base |    5 -
 ...olethAttributeFilteringEngineTest.java.svn-base |  210 -
 .../filtering/provider/match/.svn/all-wcprops      |   17 -
 .../filtering/provider/match/.svn/entries          |  102 -
 .../.svn/prop-base/BaseTestCase.java.svn-base      |    5 -
 .../prop-base/BaseTestCaseMetadata.java.svn-base   |    5 -
 .../.svn/text-base/BaseTestCase.java.svn-base      |  153 -
 .../text-base/BaseTestCaseMetadata.java.svn-base   |  144 -
 .../provider/match/basic/.svn/all-wcprops          |  113 -
 .../filtering/provider/match/basic/.svn/entries    |  640 ---
 .../prop-base/AndMatchFunctorTest.java.svn-base    |    5 -
 .../prop-base/AnyMatchFunctorTest.java.svn-base    |    5 -
 ...ributeIssuerRegexMatchFunctorTest.java.svn-base |    5 -
 ...ibuteIssuerStringMatchFunctorTest.java.svn-base |    5 -
 ...uteRequesterRegexMatchFunctorTest.java.svn-base |    5 -
 ...teRequesterStringMatchFunctorTest.java.svn-base |    5 -
 ...tributeScopeRegexMatchFunctorTest.java.svn-base |    5 -
 ...ributeScopeStringMatchFunctorTest.java.svn-base |    5 -
 ...tributeValueRegexMatchFunctorTest.java.svn-base |    5 -
 ...ributeValueStringMatchFunctorTest.java.svn-base |    5 -
 ...cationMethodRegexMatchFunctorTest.java.svn-base |    5 -
 ...ationMethodStringMatchFunctorTest.java.svn-base |    5 -
 .../prop-base/NotMatchFunctorTest.java.svn-base    |    5 -
 ...umAttributeValuesMatchFunctorTest.java.svn-base |    5 -
 .../prop-base/OrMatchFunctorTest.java.svn-base     |    5 -
 .../PrincipalRegexMatchFunctorTest.java.svn-base   |    5 -
 .../PrincipalStringMatchFunctorTest.java.svn-base  |    5 -
 .../prop-base/ScriptMatchFunctorTest.java.svn-base |    5 -
 .../text-base/AndMatchFunctorTest.java.svn-base    |   87 -
 .../text-base/AnyMatchFunctorTest.java.svn-base    |   47 -
 ...ributeIssuerRegexMatchFunctorTest.java.svn-base |   36 -
 ...ibuteIssuerStringMatchFunctorTest.java.svn-base |   64 -
 ...uteRequesterRegexMatchFunctorTest.java.svn-base |   36 -
 ...teRequesterStringMatchFunctorTest.java.svn-base |   64 -
 ...tributeScopeRegexMatchFunctorTest.java.svn-base |   69 -
 ...ributeScopeStringMatchFunctorTest.java.svn-base |   69 -
 ...tributeValueRegexMatchFunctorTest.java.svn-base |   70 -
 ...ributeValueStringMatchFunctorTest.java.svn-base |   64 -
 ...cationMethodRegexMatchFunctorTest.java.svn-base |   60 -
 ...ationMethodStringMatchFunctorTest.java.svn-base |   60 -
 .../text-base/NotMatchFunctorTest.java.svn-base    |   34 -
 ...umAttributeValuesMatchFunctorTest.java.svn-base |   50 -
 .../text-base/OrMatchFunctorTest.java.svn-base     |   78 -
 .../PrincipalRegexMatchFunctorTest.java.svn-base   |   65 -
 .../PrincipalStringMatchFunctorTest.java.svn-base  |   60 -
 .../text-base/ScriptMatchFunctorTest.java.svn-base |   73 -
 .../filtering/provider/match/saml/.svn/all-wcprops |   53 -
 .../filtering/provider/match/saml/.svn/entries     |  300 -
 ...ttributeExactMatchFunctorTestCase.java.svn-base |    5 -
 ...ttributeRegexMatchFunctorTestCase.java.svn-base |    5 -
 ...InEntityGroupMatchFunctorTestCase.java.svn-base |    5 -
 ...IDFormatExactMatchFunctorTestCase.java.svn-base |    5 -
 ...ttributeExactMatchFunctorTestCase.java.svn-base |    5 -
 ...ttributeRegexMatchFunctorTestCase.java.svn-base |    5 -
 ...InEntityGroupMatchFunctorTestCase.java.svn-base |    5 -
 ...IDFormatExactMatchFunctorTestCase.java.svn-base |    5 -
 ...ttributeExactMatchFunctorTestCase.java.svn-base |  135 -
 ...ttributeRegexMatchFunctorTestCase.java.svn-base |  137 -
 ...InEntityGroupMatchFunctorTestCase.java.svn-base |   62 -
 ...IDFormatExactMatchFunctorTestCase.java.svn-base |   64 -
 ...ttributeExactMatchFunctorTestCase.java.svn-base |  135 -
 ...ttributeRegexMatchFunctorTestCase.java.svn-base |  137 -
 ...InEntityGroupMatchFunctorTestCase.java.svn-base |   62 -
 ...IDFormatExactMatchFunctorTestCase.java.svn-base |   64 -
 .../common/attribute/resolver/.svn/all-wcprops     |    5 -
 .../common/attribute/resolver/.svn/entries         |   31 -
 .../attribute/resolver/provider/.svn/all-wcprops   |    5 -
 .../attribute/resolver/provider/.svn/entries       |   31 -
 .../provider/attributeDefinition/.svn/all-wcprops  |   11 -
 .../provider/attributeDefinition/.svn/entries      |   62 -
 .../MappedAttributeDefinitionTest.java.svn-base    |    5 -
 .../MappedAttributeDefinitionTest.java.svn-base    |  157 -
 .../shibboleth/common/binding/.svn/all-wcprops     |    5 -
 .../shibboleth/common/binding/.svn/entries         |   31 -
 .../common/binding/security/.svn/all-wcprops       |    5 -
 .../common/binding/security/.svn/entries           |   28 -
 .../shibboleth/common/config/.svn/all-wcprops      |   17 -
 .../shibboleth/common/config/.svn/entries          |  108 -
 .../prop-base/BaseConfigTestCase.java.svn-base     |    5 -
 .../SpringConfigurationUtilsTest.java.svn-base     |    5 -
 .../text-base/BaseConfigTestCase.java.svn-base     |  107 -
 .../SpringConfigurationUtilsTest.java.svn-base     |   57 -
 .../common/config/attribute/.svn/all-wcprops       |   17 -
 .../common/config/attribute/.svn/entries           |  102 -
 .../SAML1AttributeAuthorityTest.java.svn-base      |    5 -
 .../SAML2AttributeAuthorityTest.java.svn-base      |    5 -
 .../SAML1AttributeAuthorityTest.java.svn-base      |   70 -
 .../SAML2AttributeAuthorityTest.java.svn-base      |   68 -
 .../config/attribute/filter/.svn/all-wcprops       |   11 -
 .../common/config/attribute/filter/.svn/entries    |   62 -
 .../AttributeFilterPolicyTest.java.svn-base        |    5 -
 .../AttributeFilterPolicyTest.java.svn-base        |  118 -
 .../config/attribute/resolver/.svn/all-wcprops     |   29 -
 .../common/config/attribute/resolver/.svn/entries  |  164 -
 .../BasicAttributeResolverTest.java.svn-base       |    5 -
 .../DBAttributeResolverTest.java.svn-base          |    5 -
 .../MappedAttributeResolverTest.java.svn-base      |    5 -
 .../TemplateAttributeResolverTest.java.svn-base    |    5 -
 .../BasicAttributeResolverTest.java.svn-base       |   63 -
 .../DBAttributeResolverTest.java.svn-base          |   83 -
 .../MappedAttributeResolverTest.java.svn-base      |   68 -
 .../TemplateAttributeResolverTest.java.svn-base    |   61 -
 .../common/config/metadata/.svn/all-wcprops        |   35 -
 .../shibboleth/common/config/metadata/.svn/entries |  198 -
 .../ChainingMetadataProviderTest.java.svn-base     |    5 -
 .../FilesystemMetadataProviderTest.java.svn-base   |    5 -
 .../HTTPMetadataProviderTest.java.svn-base         |    5 -
 .../InlineMetadataProviderTest.java.svn-base       |    5 -
 .../ResourceMetadataProviderTest.java.svn-base     |    5 -
 .../ChainingMetadataProviderTest.java.svn-base     |   88 -
 .../FilesystemMetadataProviderTest.java.svn-base   |   78 -
 .../HTTPMetadataProviderTest.java.svn-base         |   65 -
 .../InlineMetadataProviderTest.java.svn-base       |   92 -
 .../ResourceMetadataProviderTest.java.svn-base     |   65 -
 .../common/config/relyingparty/.svn/all-wcprops    |   11 -
 .../common/config/relyingparty/.svn/entries        |   62 -
 ...yingPartyConfigurationManagerTest.java.svn-base |    5 -
 ...yingPartyConfigurationManagerTest.java.svn-base |   45 -
 .../common/config/security/.svn/all-wcprops        |   35 -
 .../shibboleth/common/config/security/.svn/entries |  198 -
 ...CertPathPKIXValidationOptionsTest.java.svn-base |    5 -
 .../PKIXValidationOptionsTest.java.svn-base        |    5 -
 ...XValidationOptionsTrustEngineTest.java.svn-base |    5 -
 ...taticPKIXSignatureTrustEngineTest.java.svn-base |    5 -
 ...PKIXX509CredentialTrustEngineTest.java.svn-base |    5 -
 ...CertPathPKIXValidationOptionsTest.java.svn-base |   87 -
 .../PKIXValidationOptionsTest.java.svn-base        |  102 -
 ...XValidationOptionsTrustEngineTest.java.svn-base |  136 -
 ...taticPKIXSignatureTrustEngineTest.java.svn-base |   84 -
 ...PKIXX509CredentialTrustEngineTest.java.svn-base |   84 -
 .../shibboleth/common/resource/.svn/all-wcprops    |   11 -
 .../shibboleth/common/resource/.svn/entries        |   62 -
 .../.svn/prop-base/SVNResourceTest.java.svn-base   |    5 -
 .../.svn/text-base/SVNResourceTest.java.svn-base   |  147 -
 .../shibboleth/common/security/.svn/all-wcprops    |   11 -
 .../shibboleth/common/security/.svn/entries        |   62 -
 ...ValidationInformationResolverTest.java.svn-base |    5 -
 ...ValidationInformationResolverTest.java.svn-base |  364 --
 .../shibboleth/common/util/.svn/all-wcprops        |   11 -
 .../middleware/shibboleth/common/util/.svn/entries |   62 -
 ...ventingMapBasedStorageServiceTest.java.svn-base |    5 -
 ...ventingMapBasedStorageServiceTest.java.svn-base |  138 -
 .../shibboleth/common/xmlobject/.svn/all-wcprops   |   11 -
 .../shibboleth/common/xmlobject/.svn/entries       |   65 -
 .../BaseShibObjectProviderTestCase.java.svn-base   |    5 -
 .../BaseShibObjectProviderTestCase.java.svn-base   |  127 -
 .../common/xmlobject/impl/.svn/all-wcprops         |   23 -
 .../shibboleth/common/xmlobject/impl/.svn/entries  |  130 -
 .../prop-base/ShibMDKeyAuthorityTest.java.svn-base |    5 -
 .../.svn/prop-base/ShibMDScopeTest.java.svn-base   |    5 -
 .../prop-base/ShibScopedValueTest.java.svn-base    |    5 -
 .../text-base/ShibMDKeyAuthorityTest.java.svn-base |  132 -
 .../.svn/text-base/ShibMDScopeTest.java.svn-base   |  115 -
 .../text-base/ShibScopedValueTest.java.svn-base    |  102 -
 src/test/resources/.svn/all-wcprops                |   11 -
 src/test/resources/.svn/entries                    |   65 -
 .../.svn/prop-base/logback-test.xml.svn-base       |    9 -
 .../.svn/text-base/logback-test.xml.svn-base       |   23 -
 src/test/resources/data/.svn/all-wcprops           |    5 -
 src/test/resources/data/.svn/entries               |   34 -
 src/test/resources/data/database/.svn/all-wcprops  |   17 -
 src/test/resources/data/database/.svn/entries      |   96 -
 .../.svn/prop-base/shibdb.properties.svn-base      |    5 -
 .../.svn/text-base/shibdb.properties.svn-base      |   17 -
 .../database/.svn/text-base/shibdb.script.svn-base |   53 -
 src/test/resources/data/edu/.svn/all-wcprops       |    5 -
 src/test/resources/data/edu/.svn/entries           |   31 -
 .../resources/data/edu/internet2/.svn/all-wcprops  |    5 -
 src/test/resources/data/edu/internet2/.svn/entries |   31 -
 .../data/edu/internet2/middleware/.svn/all-wcprops |    5 -
 .../data/edu/internet2/middleware/.svn/entries     |   31 -
 .../middleware/shibboleth/.svn/all-wcprops         |    5 -
 .../internet2/middleware/shibboleth/.svn/entries   |   31 -
 .../middleware/shibboleth/common/.svn/all-wcprops  |    5 -
 .../middleware/shibboleth/common/.svn/entries      |   40 -
 .../shibboleth/common/attribute/.svn/all-wcprops   |    5 -
 .../shibboleth/common/attribute/.svn/entries       |   31 -
 .../common/attribute/filtering/.svn/all-wcprops    |   23 -
 .../common/attribute/filtering/.svn/entries        |  133 -
 .../filtering/.svn/prop-base/policy1.xml.svn-base  |    9 -
 .../filtering/.svn/prop-base/policy2.xml.svn-base  |    9 -
 .../filtering/.svn/prop-base/policy3.xml.svn-base  |    9 -
 .../filtering/.svn/text-base/policy1.xml.svn-base  |   95 -
 .../filtering/.svn/text-base/policy2.xml.svn-base  |   22 -
 .../filtering/.svn/text-base/policy3.xml.svn-base  |   12 -
 .../attribute/filtering/provider/.svn/all-wcprops  |    5 -
 .../attribute/filtering/provider/.svn/entries      |   31 -
 .../filtering/provider/match/.svn/all-wcprops      |    5 -
 .../filtering/provider/match/.svn/entries          |   31 -
 .../provider/match/basic/.svn/all-wcprops          |   11 -
 .../filtering/provider/match/basic/.svn/entries    |   62 -
 .../basic/.svn/prop-base/metadata.xml.svn-base     |    9 -
 .../basic/.svn/text-base/metadata.xml.svn-base     | 1113 ----
 .../shibboleth/common/config/.svn/all-wcprops      |   11 -
 .../shibboleth/common/config/.svn/entries          |   74 -
 .../config/.svn/prop-base/base-config.xml.svn-base |    9 -
 .../config/.svn/text-base/base-config.xml.svn-base |   76 -
 .../common/config/attribute/.svn/all-wcprops       |   11 -
 .../common/config/attribute/.svn/entries           |   68 -
 .../.svn/prop-base/service-config.xml.svn-base     |    9 -
 .../.svn/text-base/service-config.xml.svn-base     |   23 -
 .../config/attribute/filter/.svn/all-wcprops       |   11 -
 .../common/config/attribute/filter/.svn/entries    |   62 -
 .../.svn/prop-base/service-config.xml.svn-base     |    9 -
 .../.svn/text-base/service-config.xml.svn-base     |   37 -
 .../config/attribute/resolver/.svn/all-wcprops     |   53 -
 .../common/config/attribute/resolver/.svn/entries  |  300 -
 .../.svn/prop-base/resolver-config.xml.svn-base    |    9 -
 .../.svn/prop-base/resolver-db-config.xml.svn-base |    9 -
 .../.svn/prop-base/resolver-db.xml.svn-base        |    9 -
 .../prop-base/resolver-mapped-config.xml.svn-base  |    9 -
 .../.svn/prop-base/resolver-mapped.xml.svn-base    |    9 -
 .../resolver-template-config.xml.svn-base          |    9 -
 .../.svn/prop-base/resolver-template.xml.svn-base  |    9 -
 .../resolver/.svn/prop-base/resolver.xml.svn-base  |    9 -
 .../.svn/text-base/resolver-config.xml.svn-base    |   19 -
 .../.svn/text-base/resolver-db-config.xml.svn-base |   19 -
 .../.svn/text-base/resolver-db.xml.svn-base        |   45 -
 .../text-base/resolver-mapped-config.xml.svn-base  |   18 -
 .../.svn/text-base/resolver-mapped.xml.svn-base    |   55 -
 .../resolver-template-config.xml.svn-base          |   18 -
 .../.svn/text-base/resolver-template.xml.svn-base  |   34 -
 .../resolver/.svn/text-base/resolver.xml.svn-base  |   48 -
 .../common/config/metadata/.svn/all-wcprops        |  113 -
 .../shibboleth/common/config/metadata/.svn/entries |  640 ---
 .../ChainingMetadataProvider1.xml.svn-base         |    9 -
 .../ChainingMetadataProvider2.xml.svn-base         |    9 -
 .../ChainingMetadataProvider3.xml.svn-base         |    9 -
 .../FilesystemMetadataProvider1.xml.svn-base       |    9 -
 .../FilesystemMetadataProvider2.xml.svn-base       |    9 -
 .../FilesystemMetadataProvider3.xml.svn-base       |    9 -
 .../prop-base/HTTPMetadataProvider1.xml.svn-base   |    9 -
 .../prop-base/HTTPMetadataProvider2.xml.svn-base   |    9 -
 .../HTTPResourceMetadataProvider1.xml.svn-base     |    9 -
 .../HTTPResourceMetadataProvider2.xml.svn-base     |    9 -
 .../.svn/prop-base/InCommon-metadata.xml.svn-base  |    5 -
 .../prop-base/InlineMetadataProvider1.xml.svn-base |    9 -
 .../prop-base/InlineMetadataProvider2.xml.svn-base |    9 -
 .../prop-base/InlineMetadataProvider3.xml.svn-base |    9 -
 .../prop-base/InlineMetadataProvider4.xml.svn-base |    9 -
 .../metadata/.svn/prop-base/Metadata1.xml.svn-base |    9 -
 .../prop-base/shibboleth.net-metadata.xml.svn-base |    9 -
 .../prop-base/ukfederation-metadata.xml.svn-base   |    5 -
 .../ChainingMetadataProvider1.xml.svn-base         |   12 -
 .../ChainingMetadataProvider2.xml.svn-base         |   14 -
 .../ChainingMetadataProvider3.xml.svn-base         |   19 -
 .../FilesystemMetadataProvider1.xml.svn-base       |    2 -
 .../FilesystemMetadataProvider2.xml.svn-base       |    2 -
 .../FilesystemMetadataProvider3.xml.svn-base       |    6 -
 .../text-base/HTTPMetadataProvider1.xml.svn-base   |    2 -
 .../text-base/HTTPMetadataProvider2.xml.svn-base   |    6 -
 .../HTTPResourceMetadataProvider1.xml.svn-base     |    6 -
 .../HTTPResourceMetadataProvider2.xml.svn-base     |    8 -
 .../.svn/text-base/InCommon-metadata.xml.svn-base  | 1113 ----
 .../text-base/InlineMetadataProvider1.xml.svn-base |   24 -
 .../text-base/InlineMetadataProvider2.xml.svn-base |   20 -
 .../text-base/InlineMetadataProvider3.xml.svn-base |    6 -
 .../text-base/InlineMetadataProvider4.xml.svn-base |   26 -
 .../metadata/.svn/text-base/Metadata1.xml.svn-base |   20 -
 .../text-base/shibboleth.net-metadata.xml.svn-base |  290 -
 .../text-base/ukfederation-metadata.xml.svn-base   | 5786 --------------------
 .../common/config/relyingparty/.svn/all-wcprops    |   17 -
 .../common/config/relyingparty/.svn/entries        |   96 -
 .../.svn/prop-base/relying-party1.xml.svn-base     |    9 -
 .../.svn/prop-base/service-config.xml.svn-base     |    9 -
 .../.svn/text-base/relying-party1.xml.svn-base     |   17 -
 .../.svn/text-base/service-config.xml.svn-base     |   16 -
 .../common/config/security/.svn/all-wcprops        |   89 -
 .../shibboleth/common/config/security/.svn/entries |  504 --
 .../CertPathPKIXValidationOptions1.xml.svn-base    |    9 -
 .../CertPathPKIXValidationOptions2.xml.svn-base    |    9 -
 .../CertPathPKIXValidationOptions3.xml.svn-base    |    9 -
 .../MetadataPKIXTrustEngines-Options.xml.svn-base  |    9 -
 .../prop-base/PKIXValidationOptions1.xml.svn-base  |    9 -
 .../prop-base/PKIXValidationOptions2.xml.svn-base  |    9 -
 .../prop-base/PKIXValidationOptions3.xml.svn-base  |    9 -
 .../prop-base/PKIXValidationOptions4.xml.svn-base  |    9 -
 ...icPKIXSignatureTrustEngine-Options.xml.svn-base |    9 -
 .../StaticPKIXSignatureTrustEngine1.xml.svn-base   |    9 -
 .../StaticPKIXSignatureTrustEngine2.xml.svn-base   |    9 -
 ...XX509CredentialTrustEngine-Options.xml.svn-base |    9 -
 ...aticPKIXX509CredentialTrustEngine1.xml.svn-base |    9 -
 ...aticPKIXX509CredentialTrustEngine2.xml.svn-base |    9 -
 .../CertPathPKIXValidationOptions1.xml.svn-base    |    2 -
 .../CertPathPKIXValidationOptions2.xml.svn-base    |    2 -
 .../CertPathPKIXValidationOptions3.xml.svn-base    |    2 -
 .../MetadataPKIXTrustEngines-Options.xml.svn-base  |   29 -
 .../text-base/PKIXValidationOptions1.xml.svn-base  |    2 -
 .../text-base/PKIXValidationOptions2.xml.svn-base  |    2 -
 .../text-base/PKIXValidationOptions3.xml.svn-base  |    2 -
 .../text-base/PKIXValidationOptions4.xml.svn-base  |    2 -
 ...icPKIXSignatureTrustEngine-Options.xml.svn-base |   34 -
 .../StaticPKIXSignatureTrustEngine1.xml.svn-base   |   32 -
 .../StaticPKIXSignatureTrustEngine2.xml.svn-base   |   11 -
 ...XX509CredentialTrustEngine-Options.xml.svn-base |   34 -
 ...aticPKIXX509CredentialTrustEngine1.xml.svn-base |   32 -
 ...aticPKIXX509CredentialTrustEngine2.xml.svn-base |   11 -
 .../shibboleth/common/security/.svn/all-wcprops    |   59 -
 .../shibboleth/common/security/.svn/entries        |  334 --
 .../prop-base/empty-metadata-pkix.xml.svn-base     |    9 -
 .../names-entities-metadata-pkix.xml.svn-base      |    9 -
 .../nodepth-entities-metadata-pkix.xml.svn-base    |    9 -
 .../oneset-3keyinfo-metadata-pkix.xml.svn-base     |    9 -
 .../oneset-entities-metadata-pkix.xml.svn-base     |    9 -
 .../oneset-entity-metadata-pkix.xml.svn-base       |    9 -
 ...ty-entities-entities-metadata-pkix.xml.svn-base |    9 -
 ...authorities-entities-metadata-pkix.xml.svn-base |    9 -
 ...oset-entity-entities-metadata-pkix.xml.svn-base |    9 -
 .../text-base/empty-metadata-pkix.xml.svn-base     |   59 -
 .../names-entities-metadata-pkix.xml.svn-base      |  141 -
 .../nodepth-entities-metadata-pkix.xml.svn-base    |  143 -
 .../oneset-3keyinfo-metadata-pkix.xml.svn-base     |  257 -
 .../oneset-entities-metadata-pkix.xml.svn-base     |  142 -
 .../oneset-entity-metadata-pkix.xml.svn-base       |  143 -
 ...ty-entities-entities-metadata-pkix.xml.svn-base |  296 -
 ...authorities-entities-metadata-pkix.xml.svn-base |  188 -
 ...oset-entity-entities-metadata-pkix.xml.svn-base |  262 -
 .../shibboleth/common/xmlobject/.svn/all-wcprops   |    5 -
 .../shibboleth/common/xmlobject/.svn/entries       |   31 -
 .../common/xmlobject/impl/.svn/all-wcprops         |   47 -
 .../shibboleth/common/xmlobject/impl/.svn/entries  |  266 -
 .../.svn/prop-base/ShibMDKeyAuthority.xml.svn-base |    9 -
 .../ShibMDKeyAuthorityChildElements.xml.svn-base   |    9 -
 ...ibMDKeyAuthorityOptionalAttributes.xml.svn-base |    9 -
 .../impl/.svn/prop-base/ShibMDScope.xml.svn-base   |    9 -
 .../ShibMDScopeOptionalAttributes.xml.svn-base     |    9 -
 .../.svn/prop-base/ShibScopedValue.xml.svn-base    |    9 -
 .../ShibScopedValueOptionalAttributes.xml.svn-base |    9 -
 .../.svn/text-base/ShibMDKeyAuthority.xml.svn-base |    2 -
 .../ShibMDKeyAuthorityChildElements.xml.svn-base   |    7 -
 ...ibMDKeyAuthorityOptionalAttributes.xml.svn-base |    2 -
 .../impl/.svn/text-base/ShibMDScope.xml.svn-base   |    2 -
 .../ShibMDScopeOptionalAttributes.xml.svn-base     |    2 -
 .../.svn/text-base/ShibScopedValue.xml.svn-base    |    2 -
 .../ShibScopedValueOptionalAttributes.xml.svn-base |    2 -
 1424 files changed, 95276 deletions(-)

diff --git a/.settings/.svn/all-wcprops b/.settings/.svn/all-wcprops
deleted file mode 100644
index e16167a..0000000
--- a/.settings/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/java-shib-common/!svn/ver/1091/branches/REL_1/.settings
-END
-org.eclipse.jdt.core.prefs
-K 25
-svn:wc:ra_dav:version-url
-V 83
-/java-shib-common/!svn/ver/1091/branches/REL_1/.settings/org.eclipse.jdt.core.prefs
-END
-org.eclipse.m2e.core.prefs
-K 25
-svn:wc:ra_dav:version-url
-V 83
-/java-shib-common/!svn/ver/1091/branches/REL_1/.settings/org.eclipse.m2e.core.prefs
-END
-org.eclipse.jdt.ui.prefs
-K 25
-svn:wc:ra_dav:version-url
-V 81
-/java-shib-common/!svn/ver/1091/branches/REL_1/.settings/org.eclipse.jdt.ui.prefs
-END
-org.eclipse.core.resources.prefs
-K 25
-svn:wc:ra_dav:version-url
-V 89
-/java-shib-common/!svn/ver/1091/branches/REL_1/.settings/org.eclipse.core.resources.prefs
-END
diff --git a/.settings/.svn/entries b/.settings/.svn/entries
deleted file mode 100644
index ce8e7ab..0000000
--- a/.settings/.svn/entries
+++ /dev/null
@@ -1,164 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/.settings
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2014-01-17T13:52:24.366950Z
-1091
-iay
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-org.eclipse.jdt.core.prefs
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-34a6dd095fd5852449895cfff6729e7f
-2014-01-17T13:52:24.366950Z
-1091
-iay
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-28011
-

-org.eclipse.m2e.core.prefs
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-b662ec9b2a9e308f5ae8e4b034ea7799
-2014-01-17T13:52:24.366950Z
-1091
-iay
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-86
-

-org.eclipse.jdt.ui.prefs
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-6f20c066613198cb379caabe4418f193
-2014-01-17T13:52:24.366950Z
-1091
-iay
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8602
-

-org.eclipse.core.resources.prefs
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-1119f10e0d1dd286fe8391519d048c93
-2014-01-17T13:52:24.366950Z
-1091
-iay
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-185
-

diff --git a/.settings/.svn/text-base/org.eclipse.core.resources.prefs.svn-base b/.settings/.svn/text-base/org.eclipse.core.resources.prefs.svn-base
deleted file mode 100644
index 29abf99..0000000
--- a/.settings/.svn/text-base/org.eclipse.core.resources.prefs.svn-base
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/.settings/.svn/text-base/org.eclipse.jdt.core.prefs.svn-base b/.settings/.svn/text-base/org.eclipse.jdt.core.prefs.svn-base
deleted file mode 100644
index 4e729f0..0000000
--- a/.settings/.svn/text-base/org.eclipse.jdt.core.prefs.svn-base
+++ /dev/null
@@ -1,351 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=1
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/.settings/.svn/text-base/org.eclipse.jdt.ui.prefs.svn-base b/.settings/.svn/text-base/org.eclipse.jdt.ui.prefs.svn-base
deleted file mode 100644
index bdc8c0e..0000000
--- a/.settings/.svn/text-base/org.eclipse.jdt.ui.prefs.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-cleanup.add_default_serial_version_id=false
-cleanup.add_generated_serial_version_id=true
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=false
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=true
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_Shibboleth
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Shibboleth
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Commen [...]
diff --git a/.settings/.svn/text-base/org.eclipse.m2e.core.prefs.svn-base b/.settings/.svn/text-base/org.eclipse.m2e.core.prefs.svn-base
deleted file mode 100644
index f897a7f..0000000
--- a/.settings/.svn/text-base/org.eclipse.m2e.core.prefs.svn-base
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/.svn/all-wcprops b/.svn/all-wcprops
deleted file mode 100644
index a7f52a0..0000000
--- a/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 46
-/java-shib-common/!svn/ver/1091/branches/REL_1
-END
-.classpath
-K 25
-svn:wc:ra_dav:version-url
-V 57
-/java-shib-common/!svn/ver/1066/branches/REL_1/.classpath
-END
-.project
-K 25
-svn:wc:ra_dav:version-url
-V 55
-/java-shib-common/!svn/ver/1048/branches/REL_1/.project
-END
-pom.xml
-K 25
-svn:wc:ra_dav:version-url
-V 54
-/java-shib-common/!svn/ver/1089/branches/REL_1/pom.xml
-END
-.checkstyle
-K 25
-svn:wc:ra_dav:version-url
-V 58
-/java-shib-common/!svn/ver/1074/branches/REL_1/.checkstyle
-END
diff --git a/.svn/dir-prop-base b/.svn/dir-prop-base
deleted file mode 100644
index b5cfd6f..0000000
--- a/.svn/dir-prop-base
+++ /dev/null
@@ -1,7 +0,0 @@
-K 10
-svn:ignore
-V 19
-test-output
-target
-
-END
diff --git a/.svn/entries b/.svn/entries
deleted file mode 100644
index 013362c..0000000
--- a/.svn/entries
+++ /dev/null
@@ -1,173 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2014-01-17T13:52:24.366950Z
-1091
-iay
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-pom.xml
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-c40485002661ddc88c9d4b7953a3b4e7
-2013-12-23T13:38:40.582811Z
-1089
-iay
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10685
-

-.checkstyle
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-dffd11865572316475c468c6e7d6f263
-2013-04-16T00:40:17.596631Z
-1074
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-854
-

-.settings
-dir
-

-.classpath
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-1150c03db7d938d793554c1e426e9d28
-2013-03-23T00:08:52.429507Z
-1066
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1397
-

-.project
-file
-
-
-
-
-2014-02-19T17:27:46.242846Z
-addec95200fbdc082c826e5fe7ddbd6b
-2012-12-14T01:41:13.788248Z
-1048
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-725
-

-doc
-dir
-

-src
-dir
-

diff --git a/.svn/prop-base/pom.xml.svn-base b/.svn/prop-base/pom.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/.svn/prop-base/pom.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/.svn/text-base/.checkstyle.svn-base b/.svn/text-base/.checkstyle.svn-base
deleted file mode 100644
index 5f7bc9b..0000000
--- a/.svn/text-base/.checkstyle.svn-base
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-
-   <local-check-config name="Shibboleth Checkstyle" type="remote" description="" 
-                       location="https://svn.shibboleth.net/java-parent-projects/java-parent-project-v2/tags/1/resources/checkstyle/checkstyle.xml" >
-    <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
-    <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
-  </local-check-config>
- 
-  <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
-    <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
-  </fileset>
-  
-</fileset-config>
diff --git a/.svn/text-base/.classpath.svn-base b/.svn/text-base/.classpath.svn-base
deleted file mode 100644
index 534b5e5..0000000
--- a/.svn/text-base/.classpath.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.svn/text-base/.project.svn-base b/.svn/text-base/.project.svn-base
deleted file mode 100644
index db948f8..0000000
--- a/.svn/text-base/.project.svn-base
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>java-shib-common</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-	</natures>
-</projectDescription>
diff --git a/.svn/text-base/pom.xml.svn-base b/.svn/text-base/pom.xml.svn-base
deleted file mode 100644
index cdb9517..0000000
--- a/.svn/text-base/pom.xml.svn-base
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.shibboleth</groupId>
-        <artifactId>parent-v2</artifactId>
-        <version>1</version>
-    </parent>
-
-    <groupId>edu.internet2.middleware</groupId>
-    <artifactId>shibboleth-common</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>Shibboleth Common Library</name>
-    <description>
-        The Shibboleth Common Library provides services/infrastructure that is common between Identity 
-        and Service providers.
-    </description>
-
-    <properties>
-        <svn.relative.location>java-shib-common</svn.relative.location>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>shib-release</id>
-            <url>https://build.shibboleth.net/nexus/content/groups/public</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>shib-snapshot</id>
-            <url>https://build.shibboleth.net/nexus/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <!-- Compile dependencies -->
-        <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>opensaml</artifactId>
-            <version>2.6.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            </dependency>
-        <dependency>
-            <groupId>net.sf.jgrapht</groupId>
-            <artifactId>jgrapht</artifactId>
-            <version>0.8.3</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache-core</artifactId>
-            <version>1.7.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>c3p0</groupId>
-            <artifactId>c3p0</artifactId>
-            <version>0.9.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>edu.vt.middleware</groupId>
-            <artifactId>vt-ldap</artifactId>
-            <version>3.3.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>aopalliance</artifactId>
-                    <groupId>aopalliance</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-aop</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jdbc</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-tx</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${spring.groupId}</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.tmatesoft.svnkit</groupId>
-            <artifactId>svnkit</artifactId>
-            <version>1.3.8</version>
-        </dependency>
-        <dependency>
-            <groupId>jargs</groupId>
-            <artifactId>jargs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.janino</groupId>
-            <artifactId>janino</artifactId>
-        </dependency>
-        <!-- TODO: overrides parent POM managed version.  Remove when appropriate. -->
-        <dependency>
-            <groupId>org.apache.santuario</groupId>
-            <artifactId>xmlsec</artifactId>
-            <version>1.5.6</version>
-        </dependency>
-        
-
-        <!-- Provided dependencies -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
-
-        <!-- Runtime dependencies -->
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-nodeps</artifactId>
-            <version>1.7.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <version>1.0b2</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xml-apis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>serializer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${xalan.groupId}</groupId>
-            <artifactId>xalan</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.8.0.10</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <index>true</index>
-                        <manifestEntries>
-                            <Main-Class>edu.internet2.middleware.shibboleth.common.Version</Main-Class>
-                        </manifestEntries>
-                        <manifestSections>
-                            <manifestSection>
-                                <name>edu/internet2/middleware/shibboleth/common/</name>
-                                <manifestEntries>
-                                    <Implementation-Title>${project.artifactId}</Implementation-Title>
-                                    <Implementation-Version>${project.version}</Implementation-Version>
-                                    <Implementation-Vendor>shibboleth.net</Implementation-Vendor>
-                                </manifestEntries>
-                            </manifestSection>
-                        </manifestSections>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <repository>
-            <id>release</id>
-            <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshot</id>
-            <url>https://build.shibboleth.net/nexus/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/bin.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <links>
-                                <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/xmltooling/1.4.0/xmltooling-1.4.0-javadoc.jar/!/</link>
-                                <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/openws/1.5.0/openws-1.5.0-javadoc.jar/!/</link>
-                                <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml/2.6.0/opensaml-2.6.0-javadoc.jar/!/</link>
-                            </links>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/doc/.svn/all-wcprops b/doc/.svn/all-wcprops
deleted file mode 100644
index 5f55131..0000000
--- a/doc/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 50
-/java-shib-common/!svn/ver/1087/branches/REL_1/doc
-END
-CREDITS.txt
-K 25
-svn:wc:ra_dav:version-url
-V 62
-/java-shib-common/!svn/ver/1069/branches/REL_1/doc/CREDITS.txt
-END
-LICENSE.txt
-K 25
-svn:wc:ra_dav:version-url
-V 61
-/java-shib-common/!svn/ver/979/branches/REL_1/doc/LICENSE.txt
-END
-RELEASE-NOTES.txt
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/java-shib-common/!svn/ver/1087/branches/REL_1/doc/RELEASE-NOTES.txt
-END
diff --git a/doc/.svn/dir-prop-base b/doc/.svn/dir-prop-base
deleted file mode 100644
index de89f81..0000000
--- a/doc/.svn/dir-prop-base
+++ /dev/null
@@ -1,8 +0,0 @@
-K 10
-svn:ignore
-V 17
-reports
-
-javadoc
-
-END
diff --git a/doc/.svn/entries b/doc/.svn/entries
deleted file mode 100644
index 118a76d..0000000
--- a/doc/.svn/entries
+++ /dev/null
@@ -1,130 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/doc
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-12-13T19:54:42.616034Z
-1087
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-RELEASE-NOTES.txt
-file
-
-
-
-
-2014-02-19T17:27:39.114707Z
-c7bf7ae1439a213820e494d47558a562
-2013-12-13T19:54:42.616034Z
-1087
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11445
-

-CREDITS.txt
-file
-
-
-
-
-2014-02-19T17:27:39.118707Z
-9c53912786c0cacfd5ae375bbd1cd6e9
-2013-03-29T19:35:35.047006Z
-1069
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2054
-

-LICENSE.txt
-file
-
-
-
-
-2014-02-19T17:27:39.114707Z
-314e21a036e4ea071f111cb5deff83c1
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10140
-

diff --git a/doc/.svn/prop-base/CREDITS.txt.svn-base b/doc/.svn/prop-base/CREDITS.txt.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/doc/.svn/prop-base/CREDITS.txt.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/doc/.svn/prop-base/LICENSE.txt.svn-base b/doc/.svn/prop-base/LICENSE.txt.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/doc/.svn/prop-base/LICENSE.txt.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/doc/.svn/prop-base/RELEASE-NOTES.txt.svn-base b/doc/.svn/prop-base/RELEASE-NOTES.txt.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/doc/.svn/prop-base/RELEASE-NOTES.txt.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/doc/.svn/text-base/CREDITS.txt.svn-base b/doc/.svn/text-base/CREDITS.txt.svn-base
deleted file mode 100644
index a12993d..0000000
--- a/doc/.svn/text-base/CREDITS.txt.svn-base
+++ /dev/null
@@ -1,94 +0,0 @@
- Current Development Team
-
-   Scott Cantor
-   The Ohio State University
-
-   Daniel Fisher
-   Virginia Tech
-   
-   Brent Putman
-   Georgetown University
-   
-   Rod Widdowson
-   Steading System Software LLP
-
-   Ian Young
-   Independent
-
-   Tom Zeller
-   Dragonacea, LLC
-      
-  
- Emeritus Developers
-
-   Derek Atkins
-
-   Jim Fox
-
-   Walter Hoehn
-
-   Chad LaJoie
-
-   Derek Morr
-
-   Will Norris
-  
- Emeritus Contributors
-
-   Steven Carmody
-   Brown University
-
-   Marlena Erdos
-
-   Ken Klingenstein
-   Internet2
-
-   Nate Klingenstein
-   Internet2
-
-   Nicole Harris
-   TERENA
-
-   RL "Bob" Morgan
-   University of Washington
-   http://shibboleth.net/community/news/20120717.html
-
-   Many others!
-   
-Additional thanks to:
-
-    Internet2
-
-    The National Science Foundation
-    
-    National Research Council of Canada
-
-    Barbara Jenson (CMU), Parviz Dousti (CMU), Tom Dopirak (CMU), 
-      and Sridhar Muppidi (IBM/Tivoli); for helping to develop 
-      the initial Shibboleth prototype
-
-    Brian Pittman (WebAssign), Mark Earnest (PSU), James Shvarts (Columbia), 
-      Ryan Muldoon (Wisconsin), John Hopkins (PSU), Noah Levitt (Columbia), 
-      and David Walker (UCOP); for much help with testing
-      
-    Dave Dearman (NRCC), for contributing a SQL Data Connector for the AA 
-      resolver back in the 1.x release
-
-    Noah Levitt (Columbia), for simplifying the  logging configuration.
-
-    Joel Murphy (Buffalo), for much help with load testing and generally
-      pushing the software to its limits.
-
-    Vishal Goenka (SunGard SCT) for contributing some useful resolver plugins
-
-    Ian Young for donating XSLT scripts for converting metadata across
-      Shibboleth versions
-
-    Derek Morr, from Penn State University, for his initial work on the 2.0 IdP
-   	  authentication engine
-        
-    Kaspar Brand for assisting in the development of CRL-related functionality
-
-    The community at large for helping with end user support, particularly
-      Peter Schober, Paul Hethmon, Kevin Foote, Russell Beall, and Christopher
-      Bongaarts
diff --git a/doc/.svn/text-base/LICENSE.txt.svn-base b/doc/.svn/text-base/LICENSE.txt.svn-base
deleted file mode 100644
index 895657b..0000000
--- a/doc/.svn/text-base/LICENSE.txt.svn-base
+++ /dev/null
@@ -1,174 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
\ No newline at end of file
diff --git a/doc/.svn/text-base/RELEASE-NOTES.txt.svn-base b/doc/.svn/text-base/RELEASE-NOTES.txt.svn-base
deleted file mode 100644
index 9e8d212..0000000
--- a/doc/.svn/text-base/RELEASE-NOTES.txt.svn-base
+++ /dev/null
@@ -1,192 +0,0 @@
-Changes in Release 1.4.1
-=============================================
-Also, updating POM to implement:
-[JXT-106] - Update Apache Santuario (xmlsec) to 1.5.6
-
-Changes in Release 1.4.0
-=============================================
-[JXT-98] -  Add support for configuring PKIX policy checking in the PKIX trust engine 
-[JOST-200] - Reduce memory usage of unit tests
-[SC-184] - Trap exceptions during LDAP connector pool inititalization
-[SC-186] -  AttributeInMetadata rule for the attribute filter (copied back from uApprove)
-[SC-187] - RequiredValidUntilFilter improperly converts duration to milliseconds
-[SC-188] - Errors in Velocity/SLF4J logging shim
-[SC-189] - Can not use the 'noResultIsError' flag in the StoredIdPrincipalConnector, schema file is incorrect
-[SIDP-499] - Allow signed requests to bypass ACS verification
-[SIDP-559] - Attribute queries are ignoring input designators
-[SIDP-575] - Add option to omit NotBefore from assertion conditions
-
-Changes in Release 1.3.7
-=============================================
-[SC-183] - Inappropriate 'RuleReference elements within an AND rule are not supported' error
-
-Changes in Release 1.3.6
-=============================================
-[SC-176] - aacli utility doesn't set peer entity role metadata for requester
-[SC-177] - aacli utility generates extra linefeed in output
-[SC-180] - ignResponses/signAssertions="conditional" incorrect for ECP profile
-[SC-181] - LDAPS certificate verification errors on failover
-[SC-182] - Unable to resolve deny rule references
-
-Changes in Release 1.3.5
-=============================================
-[SC-169] - Velocity ErrorHandler doesn't set Content-Type of response
-[SC-170] - Expose LDAP pool blockWaitTime on VT pool strategy via connector config
-[SC-171] - Bump Spring dependencies to the newest security patch release (SEC03)
-[SC-173] - LdapPoolEmptyStrategy should check that a connection to the LDAP server can be established during its initialization
-[SC-174] - Update dependencies
-
-Changes in Release 1.3.4
-=============================================
-[SC-162] - Attribute value added multiple times to retained value set if multiple policies permit the same values
-[SC-163] - NPE when using filtering based on EntityAttributes in metadata
-[SC-165] - Update dependencies
-[SC-167] - Reload of relying-party.xml creates new AbstractReloadingMetadataProvider threads without destroying earlier ones 
-
-Changes in Release 1.3.3
-=============================================
-[SIDP-161] - Filter engine removes "duplicate" scoped values based soley on the value and ignores the scope
-
-Changes in Release 1.3.2
-=============================================
-[SC-159] - attributeID property on match functors not getting loaded
-- Update OpenSAML version
-
-Changes in Release 1.3.1
-=============================================
-[SIDP-139] - Documented URI does not exist
-[SC-154] - NullPointerException in ShibbolethAttributeFilteringEngine
-[SC-155] - StoredIDDataConnector does not take into account SPNameQualifier for Attribute Queries
-[SC-156] - StoredIDPrincipalConnector does not take into account Affiliations
-[SC-158] - URL parsing in LDAP DNs broken
-
-Changes in Release 1.3.0
-=============================================
-[SC-125] - SVNResource doesn't check repository for changes, only the local working copy
-[SC-134] - Class cast exception logging errors in BaseService.loadContext
-[SC-135] - Add servlet request to Velocity error handler context
-[SC-136] - Add support for controlling the PKIXParameters "RevocationEnabled" flag through the IdP's TrustEngine configuration
-[SC-137] - FailoverDataConnector not used when validating a DataConnector
-[SC-138] - Make SPNameQualifier externally configurable
-[SC-141] - Stateless transient ID mapping feature
-[SC-142] - Create an attribute filter matching function based on the prescence of a supported NameID format in metadata
-[SC-143] - Expose lifetime setting on transientId attribute definition
-[SC-144] - Respond with UNKNOWN_PRINCIPAL_URI for /profile/SAML2/SOAP/AttributeQuery for unknown principals
-[SC-145] - Prioritization of NameID selection by RP
-[SC-146] - Incorrect filtering of scoped values when using basic:AND
-[SC-147] - Update POM to add plugin versions, use / publish to Shib.net Repo, and attach generated source and Javadocs
-[SC-148] - Update pom for vt-ldap 3.3.3
-[SC-150] - HTML-ize unsafe characters rather than naked URL encoding in error pages
-[SC-151] - Create Entity Attribute based attribute filter
-[SC-152] - Add a LogChute hook to route Velocity messages directly to slf4j, avoiding log4j
-
-Changes in Release 1.2.1
-=============================================
-[SC-115] - Unit test fails to run due to case mismatch in BaseTestCaseMetadata
-[SC-116] - By default, always sign SAML Response for SAML 1.1 SSO
-[SC-117] - Cache is never created for LdapDataConnector
-[SC-118] - Update config tooling for metadata-based trust engines to use MetadataCredentialResolverFactory 
-[SC-119] - Scoped attribute throws NPE on a null value
-[SC-120] - NPE when using non-URL in FileBackedHTTPMetadataProvider
-[SC-121] - relaying-party config fails to load with https metadata providers
-[SC-123] - Scoped attribute values return a different value string in 1.2.0 than they did in 1.1.4
-[SC-124] - Update libs for 1.2.1
-[SC-126] - SSLContext is initialized twice when using an authentication credential
-[SC-127] - Support for custom Spring configs in AACLI
-[SC-128] - Constructor arguments to VelocityErrorHandler are reversed in bean parser.
-[SC-129] - assertionLifetime attribute does not modify the lifetime in returned assertion
-[SC-130] - IssueInstant security rule is initialized with milliseconds, not seconds
-[SC-131] - principalTokenId with a null user name
-[SC-132] - NPE in MappedAttributeDefinition when the dependency attribute is null
-[SC-133] - changes to attribute-resolver.xml choke loaded IdP
-
-Changes in Release 1.2.0
-=============================================
-[SC-41] - LDAP connector caches results indefinitely
-[SC-63] - Use XML Schema duration syntax instead of integers for duration configuration options
-[SC-73] - Update LdapDataConnector for vt-ldap 3.x
-[SC-85] - PreparedStatement.setNULL requires JDBC type for certain databases
-[SC-87] - ldap reconnect only supports communication exceptions
-[SC-88] - Update libraries for 1.1.5 release
-[SC-89] - enhance toString() of ScopedAttributeValue
-[SC-90] - Chaining ResourceFilter fails to load its children filters
-[SC-91] - Unauthorized attribute release during query from SP with wrong persistent ID value
-[SC-92] - StoredIDStore Hangs On getActivePersistentIdEntry
-[SC-93] - use bind variables in the StoredId DataConnector
-[SC-94] - Support for RDBMS and StoredID statement timeouts
-[SC-96] - Default signing for 2.0 SSO over assertion rather than response
-[SC-98] - Requesting PartitionEntryIterator from EventingMapBasedStorageService results in NPE in some cases 
-[SC-99] - LDAP and RDBMS data connectors improperly initalized for use with multiple filter templates
-[SC-100] - Report logback configuration problems
-[SC-101] - LDAP data connector option to lowercase attribute names
-[SC-102] - Proxy Support for the URL Metadata Provider
-[SC-103] - Improved LDAP failover behavior
-[SC-105] - Construction of logging config path usees wrong separator
-[SC-106] - Reduce logging of data connector errors
-[SC-108] - Remove unit tests cases that won't be fixed in 2.X branch, fix the rest
-[SC-109] - aacli does not honor saml:AttributeRequesterInEntityGroup type rules
-[SC-111] - Update 3rd party libraries for 1.2.0 release
-[SC-114] - Cannot create LDAPDirectory resolver:DataConnector with empty baseDN
-
-Changes in Release 1.1.4
-=============================================
-[SC-84] - Update Libraries for Release 1.1.4
-
-Changes in Release 1.1.3
-=============================================
-[SC-61] - Several XML schemas incorrectly use xs:positiveInteger when they should really use xs:nonNegativeInteger
-[SC-66] - Cross-site scripting attack possible when incorrect URL is entered
-[SC-67] - Update libs for 1.1.3 release
-[SC-69] - LDAP data connector factory bean is inverting constructor params for poolInitialSize and poolMaxIdleSize
-[SC-70] - Upgrade Commons Pool library to 1.3
-[SC-72] -  Can't set property file for attribute-resolver.xml in service.xml
-[SC-75] - SVNResource does not work at all
-[SC-77] - StoredId doesn't carry over old (computed Id) values correctly
-[SC-78] - AACLI fail testing storedId
-[SC-79] - Configuration Reloading only works when RetryAttempts are configured
-[SC-80] - positional parameters do not get substituted in Mapped attr defs 
-[SC-81] -  attribute-resolver.xml ScriptFile type causes IdP startup failure
-[SC-82] - empty source attribute for conector computedID causes AttributeResolutionException
-[SC-83] - IdP throws HTML error (instead of SAML error) whena persistentID cannot be found
-
-Changes in Release 1.1.2
-=============================================
-* Address case where, in theory, StoredID data connector could generate the same ID more than once
-    overwrite the information for the previous record associated with that ID
-* Minor memory usage improvements
-* Pick up new lib versions
-[SC-65] - java.lang.NoSuchMethodError: ch.qos.logback.classic.LoggerContext.shutdownAndReset()
-    this was fixed in rebuild of 1.1.2
-
-Changes in Release 1.1.1
-=============================================
-[SC-58] - The maxResultSize attribute in the LDAP DataConnector is being ignored
-[SC-59] - RDBMS data connector throws NullPointerException when data source is null.
-[SC-62] - Normalize LDAP SearchFilter String
-
-Changes in Release 1.1.0
-=============================================
-- Attribute caching in LDAP and relational database connectors has been disabled by default until
-  the cache is properly cleared when a user's session expires or is destroyed.
-
-[SC-37] - Filtering engine results in intersection of policies; union of policies is desired
-[SC-38] - StoredIDStore: invalid character in prepared statement (Oracle only)
-[SC-39] - Add ability to explicitly deny the release attributes
-[SC-40] - Allow macros within configuration resources to be expanded when the resource is loaded
-[SC-42] - Allow for ResourceBackedMetadataProvider as a metadata provider resource type
-[SC-43] - Create a new Resource type that can read information from a Subversion respository
-[SC-44] - StoredIDStore Connection Resource Leak
-[SC-45] - Upgrade to OpenSAML 2.2.0
-[SC-46] - Upgrade to VT LDAP lib version 2.8.2
-[SC-47] - Check to see if the configured JDBC driver is available on the classpath, if not then error out
-[SC-48] - Blank value for edupersonaffiliation in directory causes exception when evaluating eduPersonScopedAffiliation
-[SC-49] - Add version information in library JAR manifest and provide command line tool to view it
-[SC-50] - Provide options to enumerate trusted names for static PKIX trust engines
-[SC-52] - Include SMTPAppender dependencies in base distribution
-[SC-55] - Cleanup StorageService entry classes
-[SC-56] - logback SMTP appender PatterLayout interspersed with stack trace
-[SC-57] - The RelationalDatabase connector is missing a noResultsIsError like the LDAP connector
-
-[SIDP-200] - attribute-filter.xml AtributeRule ignoreCase logic is backwards
-[SIDP-213] - aacli.sh computedid Exception in thread "main" java.lang.NullPointerException
-[SIDP-220] - creation of mapped attribute in attribute-resolver doesn't seem correct
diff --git a/src/.svn/all-wcprops b/src/.svn/all-wcprops
deleted file mode 100644
index 3701fc9..0000000
--- a/src/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 50
-/java-shib-common/!svn/ver/1088/branches/REL_1/src
-END
diff --git a/src/.svn/entries b/src/.svn/entries
deleted file mode 100644
index b77361b..0000000
--- a/src/.svn/entries
+++ /dev/null
@@ -1,34 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-12-18T01:03:02.768787Z
-1088
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-test
-dir
-

-main
-dir
-

diff --git a/src/main/.svn/all-wcprops b/src/main/.svn/all-wcprops
deleted file mode 100644
index 1512bc1..0000000
--- a/src/main/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 55
-/java-shib-common/!svn/ver/1088/branches/REL_1/src/main
-END
diff --git a/src/main/.svn/entries b/src/main/.svn/entries
deleted file mode 100644
index f0d141c..0000000
--- a/src/main/.svn/entries
+++ /dev/null
@@ -1,37 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-12-18T01:03:02.768787Z
-1088
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-assembly
-dir
-

-java
-dir
-

-resources
-dir
-

diff --git a/src/main/assembly/.svn/all-wcprops b/src/main/assembly/.svn/all-wcprops
deleted file mode 100644
index d8988dd..0000000
--- a/src/main/assembly/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/java-shib-common/!svn/ver/1017/branches/REL_1/src/main/assembly
-END
-bin.xml
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/java-shib-common/!svn/ver/1017/branches/REL_1/src/main/assembly/bin.xml
-END
diff --git a/src/main/assembly/.svn/entries b/src/main/assembly/.svn/entries
deleted file mode 100644
index ed46e5b..0000000
--- a/src/main/assembly/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/assembly
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-02-26T22:48:10.451755Z
-1017
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-bin.xml
-file
-
-
-
-
-2014-02-19T17:27:40.886741Z
-350c8ffffe94eb52e2a3dcfbf6a9b453
-2012-02-26T22:48:10.451755Z
-1017
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1792
-

diff --git a/src/main/assembly/.svn/prop-base/bin.xml.svn-base b/src/main/assembly/.svn/prop-base/bin.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/assembly/.svn/prop-base/bin.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/assembly/.svn/text-base/bin.xml.svn-base b/src/main/assembly/.svn/text-base/bin.xml.svn-base
deleted file mode 100644
index 7a45736..0000000
--- a/src/main/assembly/.svn/text-base/bin.xml.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    
-    <id>bin</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-            <directoryMode>774</directoryMode>
-            <fileMode>444</fileMode>
-            <scope>compile</scope>
-            <includes>
-                <include>*:jar:*</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/endorsed</outputDirectory>
-            <directoryMode>774</directoryMode>
-            <fileMode>444</fileMode>
-            <scope>runtime</scope>
-            <includes>
-                <include>org.apache.xerces:*</include>
-                <include>xalan:*</include>
-                <include>xml-resolver:*</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-    <fileSets>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory />
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-
-        <!-- Documentation -->
-        <fileSet>
-            <includes>
-                <include>RELEASE-NOTES*</include>
-                <include>LICENSE*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>doc/</directory>
-            <outputDirectory>/doc</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/src/main/java/.svn/all-wcprops b/src/main/java/.svn/all-wcprops
deleted file mode 100644
index c862818..0000000
--- a/src/main/java/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java
-END
-overview.html
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/java/overview.html
-END
diff --git a/src/main/java/.svn/entries b/src/main/java/.svn/entries
deleted file mode 100644
index 4d0e857..0000000
--- a/src/main/java/.svn/entries
+++ /dev/null
@@ -1,65 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-overview.html
-file
-
-
-
-
-2014-02-19T17:27:45.874839Z
-3a5f8b18ba13286966d8e066eecc7edf
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-149
-

-edu
-dir
-

diff --git a/src/main/java/.svn/prop-base/overview.html.svn-base b/src/main/java/.svn/prop-base/overview.html.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/.svn/prop-base/overview.html.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/.svn/text-base/overview.html.svn-base b/src/main/java/.svn/text-base/overview.html.svn-base
deleted file mode 100644
index 3d9ba6f..0000000
--- a/src/main/java/.svn/text-base/overview.html.svn-base
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<BODY>
-The Shibboleth Common library contains code common to the Shibboleth
-Identity Provider and upcomming Service Provider.
-</BODY>
-</HTML>
diff --git a/src/main/java/edu/.svn/all-wcprops b/src/main/java/edu/.svn/all-wcprops
deleted file mode 100644
index 520a689..0000000
--- a/src/main/java/edu/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java/edu
-END
diff --git a/src/main/java/edu/.svn/entries b/src/main/java/edu/.svn/entries
deleted file mode 100644
index 79b4d64..0000000
--- a/src/main/java/edu/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-internet2
-dir
-

diff --git a/src/main/java/edu/internet2/.svn/all-wcprops b/src/main/java/edu/internet2/.svn/all-wcprops
deleted file mode 100644
index 94f83a1..0000000
--- a/src/main/java/edu/internet2/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java/edu/internet2
-END
diff --git a/src/main/java/edu/internet2/.svn/entries b/src/main/java/edu/internet2/.svn/entries
deleted file mode 100644
index 2225b45..0000000
--- a/src/main/java/edu/internet2/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-middleware
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/.svn/all-wcprops
deleted file mode 100644
index 4f896fb..0000000
--- a/src/main/java/edu/internet2/middleware/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java/edu/internet2/middleware
-END
diff --git a/src/main/java/edu/internet2/middleware/.svn/entries b/src/main/java/edu/internet2/middleware/.svn/entries
deleted file mode 100644
index 3a9299b..0000000
--- a/src/main/java/edu/internet2/middleware/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-shibboleth
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/.svn/all-wcprops
deleted file mode 100644
index 56a0fc0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/.svn/entries
deleted file mode 100644
index c28aebe..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-common
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops
deleted file mode 100644
index 6d41bd7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 103
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common
-END
-ShibbolethException.java
-K 25
-svn:wc:ra_dav:version-url
-V 127
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/ShibbolethException.java
-END
-Version.java
-K 25
-svn:wc:ra_dav:version-url
-V 116
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/Version.java
-END
-ShibbolethConstants.java
-K 25
-svn:wc:ra_dav:version-url
-V 127
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/ShibbolethConstants.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/entries
deleted file mode 100644
index 9af0bf6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/entries
+++ /dev/null
@@ -1,166 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-relyingparty
-dir
-

-ShibbolethConstants.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-b4970670212e2082699703662e624c4a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1526
-

-service
-dir
-

-profile
-dir
-

-attribute
-dir
-

-Version.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-c403e6a077cb8fb2cad0b1c9995a70fa
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3019
-

-config
-dir
-

-security
-dir
-

-binding
-dir
-

-util
-dir
-

-log
-dir
-

-ShibbolethException.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-cca4e4876e52f7b7393065f2a0388fea
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1861
-

-session
-dir
-

-xmlobject
-dir
-

-resource
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibbolethConstants.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibbolethConstants.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibbolethConstants.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibbolethException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibbolethException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibbolethException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/Version.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/Version.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/Version.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibbolethConstants.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibbolethConstants.java.svn-base
deleted file mode 100644
index 7bb9af7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibbolethConstants.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common;
-
-import org.opensaml.common.xml.SAMLConstants;
-
-/**
- * Constants related to or used in the SAML specifications.
- */
-public class ShibbolethConstants extends SAMLConstants {
-
-    /** URI for the Shibboleth SSO profile. */
-    public static final String SHIB_SSO_PROFILE_URI = "urn:mace:shibboleth:1.0";
-    
-    /** URI for XML schema namespace for Shibboleth extensions to SAML metadata. */
-    public static final String SHIB_MDEXT10_NS = "urn:mace:shibboleth:metadata:1.0";
-    
-    /** Namespace QName prefix for Shibboleth extensions to SAML metadata. */
-    public static final String SHIB_MDEXT10_PREFIX = "shibmd";
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibbolethException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibbolethException.java.svn-base
deleted file mode 100644
index ac9f43e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibbolethException.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common;
-
-/** Base class for Shibboleth exceptions. */
-public class ShibbolethException extends Exception {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 2237688774896843473L;
-
-    /**
-     * Constructor.
-     */
-    public ShibbolethException() {
-        super();
-    }
-    
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public ShibbolethException(String message) {
-        super(message);
-    }
-    
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public ShibbolethException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-    
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public ShibbolethException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/Version.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/Version.java.svn-base
deleted file mode 100644
index 3039136..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/Version.java.svn-base
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common;
-
-/** Class for printing the version of this library. */
-public final class Version {
-
-    /** Name of the library. */
-    private static final String NAME;
-
-    /** Library version. */
-    private static final String VERSION;
-
-    /** Library major version number. */
-    private static final int MAJOR_VERSION;
-
-    /** Library minor version number. */
-    private static final int MINOR_VERSION;
-
-    /** Library micro version number. */
-    private static final int MICRO_VERSION;
-
-    /** Constructor. */
-    private Version() {
-    }
-
-    /**
-     * Main entry point to program.
-     * 
-     * @param args command line arguments
-     */
-    public static void main(String[] args) {
-        System.out.println(NAME + " version " + VERSION);
-    }
-
-    /**
-     * Gets the name of the library.
-     * 
-     * @return name of the library
-     */
-    public static String getName() {
-        return NAME;
-    }
-
-    /**
-     * Gets the version of the library.
-     * 
-     * @return version of the library
-     */
-    public static String getVersion() {
-        return VERSION;
-    }
-
-    /**
-     * Gets the major version number of the library.
-     * 
-     * @return major version number of the library
-     */
-    public static int getMajorVersion() {
-        return MAJOR_VERSION;
-    }
-
-    /**
-     * Gets the minor version number of the library.
-     * 
-     * @return minor version number of the library
-     */
-    public static int getMinorVersion() {
-        return MINOR_VERSION;
-    }
-
-    /**
-     * Gets the micro version number of the library.
-     * 
-     * @return micro version number of the library
-     */
-    public static int getMicroVersion() {
-        return MICRO_VERSION;
-    }
-
-    static {
-        Package pkg = Version.class.getPackage();
-        NAME = pkg.getImplementationTitle().intern();
-        VERSION = pkg.getImplementationVersion().intern();
-        String[] versionParts = VERSION.split("\\.");
-        MAJOR_VERSION = Integer.parseInt(versionParts[0]);
-        MINOR_VERSION = Integer.parseInt(versionParts[1]);
-        MICRO_VERSION = Integer.parseInt(versionParts[2]);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops
deleted file mode 100644
index 9613822..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops
+++ /dev/null
@@ -1,35 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 113
-/java-shib-common/!svn/ver/1084/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute
-END
-AttributeRequestException.java
-K 25
-svn:wc:ra_dav:version-url
-V 143
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/AttributeRequestException.java
-END
-AttributeAuthority.java
-K 25
-svn:wc:ra_dav:version-url
-V 136
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/AttributeAuthority.java
-END
-BaseAttribute.java
-K 25
-svn:wc:ra_dav:version-url
-V 131
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/BaseAttribute.java
-END
-AttributeRequestContext.java
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/AttributeRequestContext.java
-END
-AttributeAuthorityCLI.java
-K 25
-svn:wc:ra_dav:version-url
-V 140
-/java-shib-common/!svn/ver/1022/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/AttributeAuthorityCLI.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries
deleted file mode 100644
index 4da36ca..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries
+++ /dev/null
@@ -1,210 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-14T10:39:20.467478Z
-1084
-rdw
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-provider
-dir
-

-AttributeRequestException.java
-file
-
-
-
-
-2014-02-19T17:27:42.530774Z
-4e7199c746b0bc5d83b64b3f952759a2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1982
-

-AttributeAuthority.java
-file
-
-
-
-
-2014-02-19T17:27:42.530774Z
-b2c1b1d8ee2b48bcc0153a39e99234a9
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1904
-

-BaseAttribute.java
-file
-
-
-
-
-2014-02-19T17:27:42.530774Z
-eee442896faf0ac98920f5b4408fde31
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3645
-

-resolver
-dir
-

-AttributeRequestContext.java
-file
-
-
-
-
-2014-02-19T17:27:42.530774Z
-21e293a450bca2fa621dde888e0cd945
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2733
-

-filtering
-dir
-

-AttributeAuthorityCLI.java
-file
-
-
-
-
-2014-02-19T17:27:42.530774Z
-1236db8bfd66ec30009b4685f717f95b
-2012-04-10T02:24:37.564396Z
-1022
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-19338
-

-encoding
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeAuthority.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeAuthorityCLI.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeAuthorityCLI.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeAuthorityCLI.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeRequestContext.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeRequestContext.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeRequestException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeRequestException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/AttributeRequestException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/BaseAttribute.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/BaseAttribute.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/prop-base/BaseAttribute.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeAuthority.java.svn-base
deleted file mode 100644
index ad2c984..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute;
-
-import java.util.Map;
-
-/**
- * Interface for an attribute authority. An attribute authority will pull attribute information for the principal
- * specified in the request context. If no principal is specified it is assumed that the authority implementation will
- * be able to derive the principal from other data within the request context.
- * 
- * @param <ContextType> contextual information expected by the attribute authority
- */
-public interface AttributeAuthority<ContextType extends AttributeRequestContext> {
-
-    /**
-     * Gets the attributes for the principal identified in the request.
-     * 
-     * @param requestContext contextual information for the attribute request
-     * 
-     * @return the request attributes keyed by the attributes' IDs.
-     * 
-     * @throws AttributeRequestException thrown if there is a problem retrieving the attributes
-     */
-    public Map<String, BaseAttribute> getAttributes(ContextType requestContext)
-            throws AttributeRequestException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeAuthorityCLI.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeAuthorityCLI.java.svn-base
deleted file mode 100644
index 887d5ec..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeAuthorityCLI.java.svn-base
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute;
-
-import jargs.gnu.CmdLineParser;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObject;
-import org.opensaml.common.xml.SAMLConstants;
-import org.opensaml.saml2.metadata.SPSSODescriptor;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProviderException;
-import org.opensaml.util.resource.FilesystemResource;
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.resource.ResourceException;
-import org.opensaml.xml.io.Marshaller;
-import org.opensaml.xml.io.MarshallingException;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.w3c.dom.Element;
-
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.status.ErrorStatus;
-import ch.qos.logback.core.status.InfoStatus;
-import ch.qos.logback.core.status.StatusManager;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML1AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML2AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.SAMLMDRelyingPartyConfigurationManager;
-
-/**
- * A command line tool that allows individuals to invoke an attribute authority and inspect the resultant attribute
- * statement.
- * 
- * This tool expects to retrieve the {@link MetadataProvider} it uses under the bean name SAMLMetadataProvider, a
- * {@link SAML1AttributeAuthority} under the bean name SAML1AttributeAuthority, and a {@link SAML2AttributeAuthority}
- * under the bean name SAML2AttributeAuthority.
- */
-public class AttributeAuthorityCLI {
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(AttributeAuthorityCLI.class);
-
-    /** List of assumed Spring configuration files used with the AACLI. */
-    private static String[] aacliConfigs = { "internal.xml", "service.xml", };
-
-    /** Loaded SAML 1 Attribute Authority. */
-    private static SAML1AttributeAuthority saml1AA;
-
-    /** Loaded SAML 2 Attribute Authority. */
-    private static SAML2AttributeAuthority saml2AA;
-
-    /** Protocol String. */
-    private static String protocol;
-    
-    /**
-     * Runs this application. Help message prints if no arguments are given or if the "help" argument is given.
-     * 
-     * @param args command line arguments
-     * 
-     * @throws Exception thrown if there is a problem during program execution
-     */
-    public static void main(String[] args) throws Exception {
-        CmdLineParser parser = parseCommandArguments(args);
-        ApplicationContext appCtx = loadConfigurations(
-                (String) parser.getOptionValue(CLIParserBuilder.CONFIG_DIR_ARG),
-                (String) parser.getOptionValue(CLIParserBuilder.SPRING_EXTS_ARG)
-                );
-
-        saml1AA = (SAML1AttributeAuthority) appCtx.getBean("shibboleth.SAML1AttributeAuthority");
-        saml2AA = (SAML2AttributeAuthority) appCtx.getBean("shibboleth.SAML2AttributeAuthority");
-
-        SAMLObject attributeStatement;
-        Boolean saml1 = (Boolean) parser.getOptionValue(CLIParserBuilder.SAML1_ARG, Boolean.FALSE);
-        if (saml1.booleanValue()) {
-            protocol = SAMLConstants.SAML11P_NS;
-            attributeStatement = performSAML1AttributeResolution(parser, appCtx);
-        } else {
-            protocol = SAMLConstants.SAML20P_NS;
-            attributeStatement = performSAML2AttributeResolution(parser, appCtx);
-        }
-
-        printAttributeStatement(attributeStatement);
-    }
-
-    /**
-     * Parses the command line arguments
-     * 
-     * @param args command line arguments
-     * 
-     * @return parsed command line arguments
-     * 
-     * @throws Exception thrown if the underlying libraries could not be initialized
-     */
-    private static CmdLineParser parseCommandArguments(String[] args) throws Exception {
-        if (args.length < 2) {
-            printHelp(System.out);
-            System.out.flush();
-            System.exit(0);
-        }
-
-        CmdLineParser parser = CLIParserBuilder.buildParser();
-
-        try {
-            parser.parse(args);
-        } catch (CmdLineParser.OptionException e) {
-            errorAndExit(e.getMessage(), e);
-        }
-
-        Boolean helpEnabled = (Boolean) parser.getOptionValue(CLIParserBuilder.HELP_ARG);
-        if (helpEnabled != null) {
-            printHelp(System.out);
-            System.out.flush();
-            System.exit(0);
-        }
-
-        return parser;
-    }
-
-    /**
-     * Loads the configuration files into a Spring application context.
-     * 
-     * @param configDir directory containing spring configuration files
-     * @param springExts colon-separated list of spring extension files 
-     * 
-     * @return loaded application context
-     * 
-     * @throws IOException throw if there is an error loading the configuration files
-     * @throws ResourceException if there is an error loading the configuration files
-     */
-    private static ApplicationContext loadConfigurations(String configDir, String springExts)
-            throws IOException, ResourceException {
-        File configDirectory;
-
-        if (configDir != null) {
-            configDirectory = new File(configDir);
-        } else {
-            configDirectory = new File(System.getenv("IDP_HOME") + "/conf");
-        }
-
-        if (!configDirectory.exists() || !configDirectory.isDirectory() || !configDirectory.canRead()) {
-            errorAndExit("Configuration directory " + configDir
-                    + " does not exist, is not a directory, or is not readable", null);
-        }
-
-        loadLoggingConfiguration(configDirectory.getAbsolutePath());
-
-        File config;
-        List<String> configFiles = new ArrayList<String>();
-        List<Resource> configs = new ArrayList<Resource>();
-        
-        // Add built-in files.
-        for (String i : aacliConfigs) {
-            configFiles.add(i);
-        }
-        
-        // Add extensions, if any.
-        if (springExts != null && !springExts.isEmpty()) {
-            String[] extFiles = springExts.split(":");
-            for (String extFile : extFiles) {
-                configFiles.add(extFile);
-            }
-        }
-       
-        for (String cfile : configFiles) {
-            config = new File(configDirectory.getPath() + File.separator + cfile);
-            if (config.isDirectory() || !config.canRead()) {
-                errorAndExit("Configuration file " + config.getAbsolutePath() + " is a directory or is not readable",
-                        null);
-            }
-            configs.add(new FilesystemResource(config.getPath()));
-        }
-
-        GenericApplicationContext gContext = new GenericApplicationContext();
-        SpringConfigurationUtils.populateRegistry(gContext, configs);
-        gContext.refresh();
-        return gContext;
-    }
-
-    /**
-     * Loads the logging configuration.
-     * 
-     * @param configDir IdP configuration directory
-     */
-    private static void loadLoggingConfiguration(String configDir) {
-        String loggingConfig = configDir + File.separator + "logging.xml";
-
-        LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-        StatusManager statusManager = loggerContext.getStatusManager();
-        statusManager.add(new InfoStatus("Loading logging configuration file: " + loggingConfig, null));
-        try {
-            // loggerContext.stop();
-            loggerContext.reset();
-            JoranConfigurator configurator = new JoranConfigurator();
-            configurator.setContext(loggerContext);
-            configurator.doConfigure(new FileInputStream(loggingConfig));
-            loggerContext.start();
-        } catch (JoranException e) {
-            statusManager.add(new ErrorStatus("Error loading logging configuration file: " + configDir, null, e));
-        } catch (IOException e) {
-            statusManager.add(new ErrorStatus("Error loading logging configuration file: " + configDir, null, e));
-        }
-    }
-
-    /**
-     * Constructs a SAML 1 attribute statement with the retrieved and filtered attributes.
-     * 
-     * @param parser command line arguments
-     * @param appCtx spring application context with loaded attribute authority
-     * 
-     * @return SAML 1 attribute statement
-     */
-    private static SAMLObject performSAML1AttributeResolution(CmdLineParser parser, ApplicationContext appCtx) {
-        BaseSAMLProfileRequestContext requestCtx = buildAttributeRequestContext(parser, appCtx);
-
-        try {
-            Map<String, BaseAttribute> attributes = saml1AA.getAttributes(requestCtx);
-            return saml1AA.buildAttributeStatement(null, attributes.values());
-        } catch (AttributeRequestException e) {
-            errorAndExit("Error encountered during attribute resolution and filtering", e);
-        }
-
-        return null;
-    }
-
-    /**
-     * Constructs a SAML 2 attribute statement with the retrieved and filtered attributes.
-     * 
-     * @param parser command line arguments
-     * @param appCtx spring application context with loaded attribute authority
-     * 
-     * @return SAML 2 attribute statement
-     */
-    private static SAMLObject performSAML2AttributeResolution(CmdLineParser parser, ApplicationContext appCtx) {
-        BaseSAMLProfileRequestContext requestCtx = buildAttributeRequestContext(parser, appCtx);
-
-        try {
-            Map<String, BaseAttribute> attributes = saml2AA.getAttributes(requestCtx);
-            return saml2AA.buildAttributeStatement(null, attributes.values());
-        } catch (AttributeRequestException e) {
-            errorAndExit("Error encountered during attribute resolution and filtering", e);
-        }
-
-        return null;
-    }
-
-    /**
-     * Builds the attribute request context from the command line arguments.
-     * 
-     * @param parser command line argument parser
-     * @param appCtx spring application context
-     * 
-     * @return attribute request context
-     */
-    private static BaseSAMLProfileRequestContext buildAttributeRequestContext(CmdLineParser parser,
-            ApplicationContext appCtx) {
-        BaseSAMLProfileRequestContext requestContext = new BaseSAMLProfileRequestContext();
-
-        String[] rpConfigManagerNames = appCtx.getBeanNamesForType(SAMLMDRelyingPartyConfigurationManager.class);
-        SAMLMDRelyingPartyConfigurationManager rpConfigManager = (SAMLMDRelyingPartyConfigurationManager) appCtx
-                .getBean(rpConfigManagerNames[0]);
-
-        requestContext.setMetadataProvider(rpConfigManager.getMetadataProvider());
-
-        String requester = (String) parser.getOptionValue(CLIParserBuilder.REQUESTER_ARG);
-        if (requester != null) {
-            requestContext.setRelyingPartyConfiguration(rpConfigManager.getRelyingPartyConfiguration(requester));
-        } else {
-            requester = rpConfigManager.getAnonymousRelyingConfiguration().getRelyingPartyId();
-            requestContext.setRelyingPartyConfiguration(rpConfigManager.getAnonymousRelyingConfiguration());
-        }
-        
-        try {
-            requestContext.setInboundMessageIssuer(requester);
-            requestContext.setPeerEntityId(requester);
-            requestContext.setPeerEntityMetadata(requestContext.getMetadataProvider().getEntityDescriptor(requester));
-            if (requestContext.getPeerEntityMetadata() != null) {
-                requestContext.setPeerEntityRole(SPSSODescriptor.DEFAULT_ELEMENT_NAME);
-                requestContext.setPeerEntityRoleMetadata(requestContext.getPeerEntityMetadata().getSPSSODescriptor(protocol));
-            }
-        } catch (MetadataProviderException e) {
-            errorAndExit("Unable to query for metadata for requester " + requester, e);
-        }
-
-        try {
-            String issuer = requestContext.getRelyingPartyConfiguration().getProviderId();
-            requestContext.setOutboundMessageIssuer(issuer);
-            requestContext.setLocalEntityId(issuer);
-            requestContext.setLocalEntityMetadata(requestContext.getMetadataProvider().getEntityDescriptor(issuer));
-        } catch (MetadataProviderException e) {
-            errorAndExit("Unable to query for metadata for issuer " + requester, e);
-        }
-
-        String principal = (String) parser.getOptionValue(CLIParserBuilder.PRINCIPAL_ARG);
-        requestContext.setPrincipalName(principal);
-
-        String authnMethod = (String) parser.getOptionValue(CLIParserBuilder.AUTHN_METHOD_ARG);
-        requestContext.setPrincipalAuthenticationMethod(authnMethod);
-
-        return requestContext;
-    }
-
-    /**
-     * Prints the given attribute statement to system output.
-     * 
-     * @param attributeStatement attribute statement to print
-     */
-    private static void printAttributeStatement(SAMLObject attributeStatement) {
-        if (attributeStatement == null) {
-            System.out.println("No attribute statement.");
-            return;
-        }
-
-        Marshaller statementMarshaller = Configuration.getMarshallerFactory().getMarshaller(attributeStatement);
-
-        try {
-            Element statement = statementMarshaller.marshall(attributeStatement);
-            System.out.println(XMLHelper.prettyPrintXML(statement));
-        } catch (MarshallingException e) {
-            errorAndExit("Unable to marshall attribute statement", e);
-        }
-    }
-
-    /**
-     * Prints a help message to the given output stream.
-     * 
-     * @param out output to print the help message to
-     */
-    private static void printHelp(PrintStream out) {
-        out.println("Attribute Authority, Command Line Interface");
-        out.println("  This tools provides a command line interface to the Shibboleth Attribute Authority,");
-        out.println("  providing deployers a means to test their attribute resolution and configurations.");
-        out.println();
-        out.println("usage:");
-        out.println("  On Unix systems:       ./aacli.sh <PARAMETERS>");
-        out.println("  On Windows systems:    .\\aacli.bat <PARAMETERS>");
-        out.println();
-        out.println("Required Parameters:");
-        out.println(String.format("  --%-16s %s", CLIParserBuilder.CONFIG_DIR,
-                "Directory containing attribute authority configuration files"));
-        out.println(String.format("  --%-16s %s", CLIParserBuilder.PRINCIPAL,
-                "Principal name (user id) of the person whose attributes will be retrieved"));
-
-        out.println();
-
-        out.println("Optional Parameters:");
-        out.println(String.format("  --%-16s %s", CLIParserBuilder.HELP, "Print this message"));
-        out.println(String.format("  --%-16s %s", CLIParserBuilder.SPRING_EXTS,
-                "Colon-delimited list of files containing Spring extension configurations"));
-        out.println(String.format("  --%-16s %s", CLIParserBuilder.REQUESTER,
-                "SAML entity ID of the relying party requesting the attributes. For example, the SPs entity ID.  "
-                        + "If not provided, requester is treated as anonymous."));
-        out.println(String
-                .format("  --%-16s %s", CLIParserBuilder.AUTHN_METHOD, "Method used to authenticate the user"));
-        out.println(String.format("  --%-16s %s", CLIParserBuilder.SAML1,
-                "No-value parameter indicating the attribute "
-                        + "authority should answer as if it received a SAML 1 request"));
-
-        out.println();
-    }
-
-    /**
-     * Logs, as an error, the error message and exits the program.
-     * 
-     * @param errorMessage error message
-     * @param e exception that caused it
-     */
-    private static void errorAndExit(String errorMessage, Exception e) {
-        if (e == null) {
-            log.error(errorMessage);
-        } else {
-            log.error(errorMessage, e);
-        }
-
-        System.out.flush();
-        System.exit(1);
-    }
-
-    /**
-     * Helper class that creates the command line argument parser.
-     */
-    private static class CLIParserBuilder {
-
-        // Command line arguments
-        public static final String HELP = "help";
-
-        public static final String CONFIG_DIR = "configDir";
-        
-        public static final String SPRING_EXTS = "springExts";
-
-        public static final String REQUESTER = "requester";
-
-        public static final String ISSUER = "issuer";
-
-        public static final String PRINCIPAL = "principal";
-
-        public static final String AUTHN_METHOD = "authnMethod";
-
-        public static final String SAML1 = "saml1";
-
-        // Command line parser arguments
-        public static CmdLineParser.Option HELP_ARG;
-
-        public static CmdLineParser.Option CONFIG_DIR_ARG;
-        
-        public static CmdLineParser.Option SPRING_EXTS_ARG;
-
-        public static CmdLineParser.Option REQUESTER_ARG;
-
-        // ISSUER arg no longer used
-        public static CmdLineParser.Option ISSUER_ARG;
-
-        public static CmdLineParser.Option PRINCIPAL_ARG;
-
-        public static CmdLineParser.Option AUTHN_METHOD_ARG;
-
-        public static CmdLineParser.Option SAML1_ARG;
-
-        /**
-         * Create a new command line parser.
-         * 
-         * @return command line parser
-         */
-        public static CmdLineParser buildParser() {
-            CmdLineParser parser = new CmdLineParser();
-
-            HELP_ARG = parser.addBooleanOption(HELP);
-            CONFIG_DIR_ARG = parser.addStringOption(CONFIG_DIR);
-            SPRING_EXTS_ARG = parser.addStringOption(SPRING_EXTS);
-            REQUESTER_ARG = parser.addStringOption(REQUESTER);
-            ISSUER_ARG = parser.addStringOption(ISSUER);
-            PRINCIPAL_ARG = parser.addStringOption(PRINCIPAL);
-            AUTHN_METHOD_ARG = parser.addStringOption(AUTHN_METHOD);
-            SAML1_ARG = parser.addBooleanOption(SAML1);
-
-            return parser;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeRequestContext.java.svn-base
deleted file mode 100644
index 3718b8f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeRequestContext.java.svn-base
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Base interface for attribute resolution requests.
- */
-public interface AttributeRequestContext {
-
-    /**
-     * Gets the collection of IDs for the attributes being requested by the relying party.
-     * 
-     * @return collection of IDs for the attributes being requested by the relying party
-     */
-    public Collection<String> getRequestedAttributesIds();
-
-    /**
-     * Sets the collection of IDs for the attributes being requested by the relying party.
-     * 
-     * @param ids collection of IDs for the attributes being requested by the relying party
-     */
-    public void setRequestedAttributes(Collection<String> ids);
-
-    /**
-     * Gets the retrieved attributes.
-     * 
-     * @return retrieved attributes
-     */
-    public Map<String, BaseAttribute> getAttributes();
-
-    /**
-     * Sets the retrieved attributes.
-     * 
-     * @param attributes retrieved attributes
-     */
-    public void setAttributes(Map<String, BaseAttribute> attributes);
-    
-    /**
-     * Gets the method used to authenticate the principal.
-     * 
-     * @return method used to authenticate the principal
-     */
-    public String getPrincipalAuthenticationMethod();
-
-    /**
-     * Gets the principal name of the subject of the request.
-     * 
-     * @return principal name of the subject of the request
-     */
-    public String getPrincipalName();
-    
-    /**
-     * Sets the method used to authenticate the principal.
-     * 
-     * @param method method used to authenticate the principal
-     */
-    public void setPrincipalAuthenticationMethod(String method);
-
-    /**
-     * Sets the principal name of the subject of the request.
-     * 
-     * @param name principal name of the subject of the request
-     */
-    public void setPrincipalName(String name);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeRequestException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeRequestException.java.svn-base
deleted file mode 100644
index 7a6a508..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/AttributeRequestException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethException;
-
-/** Indicates a problem during an attribute request. */
-public class AttributeRequestException extends ShibbolethException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 6896310302593664827L;
-
-    /**
-     * Constructor.
-     */
-    public AttributeRequestException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public AttributeRequestException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeRequestException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeRequestException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/BaseAttribute.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/BaseAttribute.java.svn-base
deleted file mode 100644
index 0851041..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/text-base/BaseAttribute.java.svn-base
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-
-/**
- * A resolved attribute.
- * 
- * @param <ValueType> the object type of the values for this attribute
- */
-public abstract class BaseAttribute<ValueType> implements Comparable<BaseAttribute> {
-    
-    /** Localized human intelligible attribute name. */
-    private Map<Locale, String> displayNames;
-    
-    /** Localized human readable description of attribute. */
-    private Map<Locale, String> displayDescriptions;
-    
-    /** Constructor. */
-    protected BaseAttribute(){
-        displayNames = new HashMap<Locale, String>();
-        displayDescriptions = new HashMap<Locale, String>();
-    }
-
-    /**
-     * Gets the localized human readable description of attribute.
-     * 
-     * @return human readable description of attribute
-     */
-    public Map<Locale, String> getDisplayDescriptions() {
-        return displayDescriptions;
-    }
-
-    /**
-     * Gets the localized human readable name of the attribute.
-     * 
-     * @return human readable name of the attribute
-     */
-    public Map<Locale, String> getDisplayNames() {
-        return displayNames;
-    }
-
-    /**
-     * Gets the list of attribute encoders usable with this attribute.
-     * 
-     * @return attribute encoders usable with this attribute, must never be null
-     */
-    public abstract List<AttributeEncoder> getEncoders();
-
-    /**
-     * Gets the unique ID of the attribute.
-     * 
-     * @return unique ID of the attribute
-     */
-    public abstract String getId();
-
-    /**
-     * Gets the comparator used to sort values. If no comparator is set then the value set with be natural ordering
-     * sorted.
-     * 
-     * @return comparator used to sort values
-     */
-    public abstract Comparator<ValueType> getValueComparator();
-
-    /**
-     * Gets the values of the attribute.
-     * 
-     * @return values of the attribute, must never be null
-     */
-    public abstract Collection<ValueType> getValues();
-
-    /** {@inheritDoc} */
-    public int hashCode() {
-        return getId().hashCode();
-    }
-    
-    /** {@inheritDoc} */
-    public boolean equals(Object obj) {
-        if(obj == this){
-            return true;
-        }
-        
-        if(obj instanceof BaseAttribute){
-            return obj.hashCode() == hashCode();
-        }
-        
-        return false;
-    }
-    
-    /** {@inheritDoc} */
-    public int compareTo(BaseAttribute o) {
-        return getId().compareTo(o.getId());
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return getId();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/all-wcprops
deleted file mode 100644
index b364f3e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/all-wcprops
+++ /dev/null
@@ -1,53 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 121
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding
-END
-SAMLNameIdentifierEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 152
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/SAMLNameIdentifierEncoder.java
-END
-SAML1AttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/SAML1AttributeEncoder.java
-END
-SAML1NameIdentifierEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/SAML1NameIdentifierEncoder.java
-END
-SAML2AttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/SAML2AttributeEncoder.java
-END
-AttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 143
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/AttributeEncoder.java
-END
-AttributeEncodingException.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/AttributeEncodingException.java
-END
-XMLObjectAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 152
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/XMLObjectAttributeEncoder.java
-END
-SAML2NameIDEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 145
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/SAML2NameIDEncoder.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/entries
deleted file mode 100644
index a736f56..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/entries
+++ /dev/null
@@ -1,303 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeEncodingException.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-6be888154f646fc84cb86df67036c472
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2026
-

-provider
-dir
-

-XMLObjectAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-80497bf969863597699f8357390575d4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1229
-

-SAML2NameIDEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-d3e0d4933986e329cabb309097af4e5c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1082
-

-SAMLNameIdentifierEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-aa78197bc403a74620eb02ac33ef8f2a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1903
-

-SAML1AttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-047dba2f1ba6eb2589055942adfb3bc2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1353
-

-SAML1NameIdentifierEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-321cc6dd7bb74ce0bef09e89d3e1574b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1128
-

-SAML2AttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-717da285251fe35a7ce4a7dd96e4f43f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1714
-

-AttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.402771Z
-52814fb807076239674472168dfa8f5d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2255
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/AttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/AttributeEncodingException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/AttributeEncodingException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/AttributeEncodingException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML1AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML1AttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML1AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML1NameIdentifierEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML1NameIdentifierEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML1NameIdentifierEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML2AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML2AttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML2AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML2NameIDEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML2NameIDEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAML2NameIDEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAMLNameIdentifierEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAMLNameIdentifierEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/SAMLNameIdentifierEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/XMLObjectAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/XMLObjectAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/prop-base/XMLObjectAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/AttributeEncoder.java.svn-base
deleted file mode 100644
index 9271262..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-
-
-/**
- * Attribute encoders convert {@link BaseAttribute}s into protocol specific representations.
- * 
- * Encoders may have contain a category that can be used to distingush encoder types from
- * each other.  This inteded to be used to look up an encoder that can be used to encode 
- * attributes in accordance with a defined specification or tranmission protcol.
- * 
- * Encoders MUST be thread-safe and stateless.
- * 
- * @param <EncodedType> the type of object created by encoding the attribute
- */
-public interface AttributeEncoder<EncodedType> {
-    
-    /**
-     * Get the name of the attribute.
-     * 
-     * @return name of the attribute
-     */
-    public String getAttributeName();
-    
-    /**
-     * Sets the name of the attribute.
-     * 
-     * @param attributeName name of the attribute
-     */
-    public void setAttributeName(String attributeName);
-    
-    /**
-     * Enocdes the attribute into a protocol specific representations.
-     * 
-     * @param attribute the attribute to encode
-     * 
-     * @return the Object the attribute was encoded into
-     * 
-     * @throws AttributeEncodingException if unable to successfully encode attribute
-     */
-    public EncodedType encode(BaseAttribute attribute) throws AttributeEncodingException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/AttributeEncodingException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/AttributeEncodingException.java.svn-base
deleted file mode 100644
index d8c7a35..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/AttributeEncodingException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestException;
-
-/** Indicates a problem during the encoding of an attribute. */
-public class AttributeEncodingException extends AttributeRequestException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 2638349285053036633L;
-
-    /**
-     * Constructor.
-     */
-    public AttributeEncodingException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public AttributeEncodingException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeEncodingException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeEncodingException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML1AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML1AttributeEncoder.java.svn-base
deleted file mode 100644
index 720d272..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML1AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-/**
- * SAML 1.X attribute encoder.
- */
-public interface SAML1AttributeEncoder extends XMLObjectAttributeEncoder<org.opensaml.saml1.core.Attribute> {
-
-    /**
-     * Gets the attribute namespace.
-     * 
-     * @return attribute namespace
-     */
-    public String getNamespace();
-
-    /**
-     * Sets the attribute namespace.
-     * 
-     * @param namespace attribute namespace
-     */
-    public void setNamespace(String namespace);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML1NameIdentifierEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML1NameIdentifierEncoder.java.svn-base
deleted file mode 100644
index 2bedcb3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML1NameIdentifierEncoder.java.svn-base
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-import org.opensaml.saml1.core.NameIdentifier;
-
-/** SAML 1.X {@link NameIdentifier} encoder for attributes. */
-public interface SAML1NameIdentifierEncoder extends SAMLNameIdentifierEncoder<NameIdentifier> {
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML2AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML2AttributeEncoder.java.svn-base
deleted file mode 100644
index 0220271..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML2AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-/**
- * SAML 2.0 attribute encoder.
- */
-public interface SAML2AttributeEncoder extends XMLObjectAttributeEncoder<org.opensaml.saml2.core.Attribute> {
-
-    /**
-     * Gets the attribute's name format.
-     * 
-     * @return attribute's name format
-     */
-    public String getNameFormat();
-
-    /**
-     * Sets the attribute's name format.
-     * 
-     * @param format attribute's name format
-     */
-    public void setNameFormat(String format);
-
-    /**
-     * Gets the human friendly name of the attribute.
-     * 
-     * @return human friendly name of the attribute
-     */
-    public String getFriendlyName();
-
-    /**
-     * Sets the human friendly name of the attribute.
-     * 
-     * @param name human friendly name of the attribute
-     */
-    public void setFriendlyName(String name);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML2NameIDEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML2NameIDEncoder.java.svn-base
deleted file mode 100644
index cd4e0c7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAML2NameIDEncoder.java.svn-base
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-import org.opensaml.saml2.core.NameID;
-
-/** SAML 2.0 NameID attribute encoder. */
-public interface SAML2NameIDEncoder extends SAMLNameIdentifierEncoder<NameID> {
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAMLNameIdentifierEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAMLNameIdentifierEncoder.java.svn-base
deleted file mode 100644
index 662fef3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/SAMLNameIdentifierEncoder.java.svn-base
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-import org.opensaml.xml.XMLObject;
-
-/**
- * Base interface for encoders that generate SAML name identifiers.
- * 
- * @param <NameIDType> the type of name identifier generated
- */
-public interface SAMLNameIdentifierEncoder<NameIDType extends XMLObject> extends XMLObjectAttributeEncoder<NameIDType> {
-
-    /**
-     * Gets the name format URI for the NameID.
-     * 
-     * @return name format URI for the NameID
-     */
-    public String getNameFormat();
-
-    /**
-     * Sets the name format URI for the NameID.
-     * 
-     * @param format name format URI for the NameID
-     */
-    public void setNameFormat(String format);
-
-    /**
-     * Gets the name domain qualifier for the NameID.
-     * 
-     * @return name domain qualifier for the NameID
-     */
-    public String getNameQualifier();
-
-    /**
-     * Sets the name domain qualifier for the NameID.
-     * 
-     * @param qualifier name domain qualifier for the NameID
-     */
-    public void setNameQualifier(String qualifier);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/XMLObjectAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/XMLObjectAttributeEncoder.java.svn-base
deleted file mode 100644
index c0cf099..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/.svn/text-base/XMLObjectAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding;
-
-import org.opensaml.xml.XMLObject;
-
-/**
- * Attribute encoder that encodes attributes into XMLObjects.
- * 
- * @param <XMLObjectType> type of {@link XMLObject} the encoder produces
- */
-public interface XMLObjectAttributeEncoder<XMLObjectType extends XMLObject> extends
-        AttributeEncoder<XMLObjectType> {
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/all-wcprops
deleted file mode 100644
index 342c36e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,89 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 130
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider
-END
-SAML2StringNameIDEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML2StringNameIDEncoder.java
-END
-AbstractSAML1AttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/AbstractSAML1AttributeEncoder.java
-END
-AbstractScopedAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/AbstractScopedAttributeEncoder.java
-END
-AbstractSAML2AttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/AbstractSAML2AttributeEncoder.java
-END
-SAML1Base64AttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML1Base64AttributeEncoder.java
-END
-SAML1ScopedStringAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML1ScopedStringAttributeEncoder.java
-END
-AbstractAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/AbstractAttributeEncoder.java
-END
-SAML2Base64AttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML2Base64AttributeEncoder.java
-END
-SAML2ScopedStringAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML2ScopedStringAttributeEncoder.java
-END
-SAML1StringAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML1StringAttributeEncoder.java
-END
-SAML1StringNameIdentifierEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML1StringNameIdentifierEncoder.java
-END
-SAML1XMLObjectAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML1XMLObjectAttributeEncoder.java
-END
-SAML2StringAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML2StringAttributeEncoder.java
-END
-SAML2XMLObjectAttributeEncoder.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/SAML2XMLObjectAttributeEncoder.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/entries
deleted file mode 100644
index ccd1bf1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/entries
+++ /dev/null
@@ -1,504 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAML2StringNameIDEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-79e424cd01988b7c07c05f803ee390b2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3312
-

-AbstractSAML1AttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-e3a7e0584718b536bcc1c2c96a8c811c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2259
-

-AbstractScopedAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-1e8fc3fd7cd493716c1224bd28c85006
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5210
-

-AbstractSAML2AttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-a44acd95c067ea6cb543680a243e7ff5
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2656
-

-SAML1Base64AttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-fdc65fef1de957104ab65c4923ef8e16
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3160
-

-SAML1ScopedStringAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-45efd06cef2b0b3883c4c25d67738ba6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3223
-

-AbstractAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-1e587e0b4513974f98cd75178ddb55ca
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1557
-

-SAML2Base64AttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-d625f494036224dfaec086cb3ddf366f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3215
-

-SAML2ScopedStringAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.394771Z
-b44693189120bbeee9d6339881e86524
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3593
-

-SAML1StringAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.398771Z
-ad3adf663768066681d659bd8a02673a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2963
-

-SAML1StringNameIdentifierEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.398771Z
-590bc40b7989d33a0af9fa20cc0fdbd3
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3472
-

-SAML1XMLObjectAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.398771Z
-0384562482a21e8d86f5fdb4802aed3a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3013
-

-SAML2StringAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.398771Z
-5b33f953559169b58ae6606401a5f23d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3061
-

-SAML2XMLObjectAttributeEncoder.java
-file
-
-
-
-
-2014-02-19T17:27:42.398771Z
-40fd8c8c6983e6435bcf4366b0bae306
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3013
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractSAML1AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractSAML1AttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractSAML1AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractSAML2AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractSAML2AttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractSAML2AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractScopedAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractScopedAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/AbstractScopedAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1Base64AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1Base64AttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1Base64AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1ScopedStringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1ScopedStringAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1ScopedStringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1StringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1StringAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1StringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1StringNameIdentifierEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1StringNameIdentifierEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1StringNameIdentifierEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1XMLObjectAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1XMLObjectAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML1XMLObjectAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2Base64AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2Base64AttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2Base64AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2ScopedStringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2ScopedStringAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2ScopedStringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2StringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2StringAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2StringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2StringNameIDEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2StringNameIDEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2StringNameIDEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2XMLObjectAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2XMLObjectAttributeEncoder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/prop-base/SAML2XMLObjectAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractAttributeEncoder.java.svn-base
deleted file mode 100644
index 557667e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-
-/**
- * Base class for {@link AttributeEncoder}s.
- * 
- * @param <EncodedType> the type of object created by encoding the attribute
- */
-public abstract class AbstractAttributeEncoder<EncodedType> implements AttributeEncoder<EncodedType> {
-
-    /** Name of the attribute. */
-    private String attributeName;
-
-    /** {@inheritDoc} */
-    public String getAttributeName() {
-        return attributeName;
-    }
-
-    /** {@inheritDoc} */
-    public void setAttributeName(String newAttributeName) {
-        attributeName = newAttributeName;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractSAML1AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractSAML1AttributeEncoder.java.svn-base
deleted file mode 100644
index b9032cc..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractSAML1AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml1.core.Attribute;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML1AttributeEncoder;
-
-/**
- * Base for encoders that produce {@link Attribute}s.
- */
-public abstract class AbstractSAML1AttributeEncoder extends AbstractAttributeEncoder<Attribute> implements
-        SAML1AttributeEncoder {
-
-    /** Attribute factory. */
-    protected final SAMLObjectBuilder<Attribute> attributeBuilder;
-
-    /** Namespace of attribute. */
-    private String namespace;
-
-    /** Constructor. */
-    protected AbstractSAML1AttributeEncoder() {
-        attributeBuilder = (SAMLObjectBuilder<Attribute>) Configuration.getBuilderFactory().getBuilder(
-                Attribute.DEFAULT_ELEMENT_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /** {@inheritDoc} */
-    public void setNamespace(String newNamespace) {
-        namespace = newNamespace;
-    }
-
-    /**
-     * Populates the attribute with attribute name and namespace.
-     * 
-     * @param attribute to populate
-     */
-    protected void populateAttribute(Attribute attribute) {
-        attribute.setAttributeName(getAttributeName());
-        attribute.setAttributeNamespace(getNamespace());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractSAML2AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractSAML2AttributeEncoder.java.svn-base
deleted file mode 100644
index 189ac9c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractSAML2AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.impl.AttributeBuilder;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML2AttributeEncoder;
-
-/**
- * Base for encoders that produce {@link Attribute}s.
- */
-public abstract class AbstractSAML2AttributeEncoder extends AbstractAttributeEncoder<Attribute> implements
-        SAML2AttributeEncoder {
-
-    /** Builder for SAML 2 attribute XMLObjects. */
-    protected final SAMLObjectBuilder<Attribute> attributeBuilder;
-
-    /** Format of attribute. */
-    private String format;
-
-    /** Friendly name of attribute. */
-    private String friendlyName;
-
-    /** Constructor. */
-    protected AbstractSAML2AttributeEncoder() {
-        attributeBuilder = (AttributeBuilder) Configuration.getBuilderFactory().getBuilder(
-                Attribute.DEFAULT_ELEMENT_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public String getNameFormat() {
-        return format;
-    }
-
-    /** {@inheritDoc} */
-    public String getFriendlyName() {
-        return friendlyName;
-    }
-
-    /** {@inheritDoc} */
-    public void setNameFormat(String newFormat) {
-        format = newFormat;
-    }
-
-    /** {@inheritDoc} */
-    public void setFriendlyName(String name) {
-        friendlyName = name;
-    }
-
-    /**
-     * Populates the attribute with attribute name, name format, and friendly name information.
-     * 
-     * @param attribute to populate
-     */
-    protected void populateAttribute(Attribute attribute) {
-        attribute.setName(getAttributeName());
-        attribute.setNameFormat(getNameFormat());
-        attribute.setFriendlyName(getFriendlyName());
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractScopedAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractScopedAttributeEncoder.java.svn-base
deleted file mode 100644
index 35ed9c8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/AbstractScopedAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.Configuration;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.opensaml.xml.schema.XSString;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethScopedValue;
-
-/**
- * Base class for scoped attribute encoders.
- * 
- * @param <EncodedType> the type of object created by encoding the attribute
- */
-public abstract class AbstractScopedAttributeEncoder<EncodedType> extends AbstractAttributeEncoder<EncodedType> {
-
-    /** Builder of Shibboleth scoped value XMLObjects. */
-    private final XMLObjectBuilder<ShibbolethScopedValue> shibScopeValueBuilder = Configuration.getBuilderFactory()
-            .getBuilder(ShibbolethScopedValue.TYPE_NAME);
-
-    /** Builder of string XMLObjects. */
-    private final XMLObjectBuilder<XSString> stringValueBuilder = Configuration.getBuilderFactory().getBuilder(
-            XSString.TYPE_NAME);
-
-    /** Type of scoping to use. */
-    private String scopeType;
-
-    /** Delimeter used for "inline" scopeType. */
-    private String scopeDelimiter;
-
-    /** Attribute name used for "attribute" scopeType. */
-    private String scopeAttribute;
-
-    /**
-     * Get the scope attribute.
-     * 
-     * @return Returns the scopeAttribute.
-     */
-    public String getScopeAttribute() {
-        return scopeAttribute;
-    }
-
-    /**
-     * Get the scope delimiter.
-     * 
-     * @return Returns the scopeDelimiter.
-     */
-    public String getScopeDelimiter() {
-        return scopeDelimiter;
-    }
-
-    /**
-     * Get the scope type.
-     * 
-     * @return Returns the scopeType.
-     */
-    public String getScopeType() {
-        return scopeType;
-    }
-
-    /**
-     * Set the scope attribute.
-     * 
-     * @param newScopeAttribute The scopeAttribute to set.
-     */
-    public void setScopeAttribute(String newScopeAttribute) {
-        scopeAttribute = newScopeAttribute;
-    }
-
-    /**
-     * Set the scope delimiter.
-     * 
-     * @param newScopeDelimiter The scopeDelimiter to set.
-     */
-    public void setScopeDelimiter(String newScopeDelimiter) {
-        scopeDelimiter = newScopeDelimiter;
-    }
-
-    /**
-     * Set the scope type.
-     * 
-     * @param newScopeType The scopeType to set.
-     */
-    public void setScopeType(String newScopeType) {
-        scopeType = newScopeType;
-    }
-
-    /**
-     * Encodes attributes whose values are scoped.
-     * 
-     * @param objectName name of the attribute value element to create for each value
-     * @param attribute the attribute whose values will be encoded
-     * 
-     * @return the list of encoded attribute values
-     */
-    @SuppressWarnings("unchecked")
-    protected List<XMLObject> encodeAttributeValues(QName objectName, BaseAttribute<ScopedAttributeValue> attribute) {
-        ArrayList<XMLObject> encodedValues = new ArrayList<XMLObject>();
-
-        if ("attribute".equals(getScopeType())) {
-            ShibbolethScopedValue scopedValue;
-
-            for (ScopedAttributeValue attributeValue : attribute.getValues()) {
-                if (attributeValue == null) {
-                    continue;
-                }
-
-                scopedValue = shibScopeValueBuilder.buildObject(objectName);
-                scopedValue.setScopeAttributeName(getScopeAttribute());
-                scopedValue.setScope(attributeValue.getScope());
-                scopedValue.setValue(attributeValue.getValue());
-
-                encodedValues.add(scopedValue);
-            }
-
-        } else if ("inline".equals(getScopeType())) {
-            XSString scopedValue;
-
-            for (ScopedAttributeValue attributeValue : attribute.getValues()) {
-                if (attributeValue == null) {
-                    continue;
-                }
-
-                scopedValue = stringValueBuilder.buildObject(objectName, XSString.TYPE_NAME);
-                scopedValue.setValue(attributeValue.getValue() + getScopeDelimiter() + attributeValue.getScope());
-
-                encodedValues.add(scopedValue);
-            }
-
-        }
-
-        return encodedValues;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1Base64AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1Base64AttributeEncoder.java.svn-base
deleted file mode 100644
index f2c652e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1Base64AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.saml1.core.Attribute;
-import org.opensaml.saml1.core.AttributeValue;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.opensaml.xml.schema.XSString;
-import org.opensaml.xml.util.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-
-/**
- * Implementation of SAML 1.X attribute encoder.
- * 
- * This attribute encoder only operates of {@link BaseAttribute}s with values of type <code>byte[]</code>.
- */
-public class SAML1Base64AttributeEncoder extends AbstractSAML1AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML1Base64AttributeEncoder.class);
-
-    /** XSString factory. */
-    private final XMLObjectBuilder<XSString> stringBuilder;
-
-    /** Constructor. */
-    public SAML1Base64AttributeEncoder() {
-        super();
-
-        stringBuilder = Configuration.getBuilderFactory().getBuilder(XSString.TYPE_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        populateAttribute(samlAttribute);
-
-        byte[] attributeValue;
-        XSString samlAttributeValue;
-        for (Object o : attribute.getValues()) {
-            if (o == null || !(o instanceof byte[])) {
-                log.debug("Skipping attribute value because it is either null or not a byte[]");
-                continue;
-            }
-            
-            attributeValue = (byte[]) o;
-            samlAttributeValue = stringBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME);
-            samlAttributeValue.setValue(Base64.encodeBytes(attributeValue));
-            samlAttribute.getAttributeValues().add(samlAttributeValue);
-        }
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1ScopedStringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1ScopedStringAttributeEncoder.java.svn-base
deleted file mode 100644
index 4fd9cc0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1ScopedStringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml1.core.Attribute;
-import org.opensaml.saml1.core.AttributeValue;
-import org.opensaml.xml.XMLObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML1AttributeEncoder;
-
-/**
- * Implementation of SAML 1.X scoped attribute encoder.
- */
-public class SAML1ScopedStringAttributeEncoder extends
-        AbstractScopedAttributeEncoder<org.opensaml.saml1.core.Attribute> implements SAML1AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML1ScopedStringAttributeEncoder.class);
-
-    /** Attribute factory. */
-    private final SAMLObjectBuilder<Attribute> attributeBuilder;
-
-    /** Namespace of attribute. */
-    private String namespace;
-
-    /** Constructor. */
-    public SAML1ScopedStringAttributeEncoder() {
-        super();
-        attributeBuilder = (SAMLObjectBuilder<Attribute>) Configuration.getBuilderFactory().getBuilder(
-                Attribute.DEFAULT_ELEMENT_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /** {@inheritDoc} */
-    public void setNamespace(String newNamespace) {
-        namespace = newNamespace;
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) throws AttributeEncodingException {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        samlAttribute.setAttributeName(getAttributeName());
-        samlAttribute.setAttributeNamespace(getNamespace());
-        samlAttribute.getAttributeValues()
-                .addAll(encodeAttributeValues(AttributeValue.DEFAULT_ELEMENT_NAME, attribute));
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1StringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1StringAttributeEncoder.java.svn-base
deleted file mode 100644
index 4c04414..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1StringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.saml1.core.Attribute;
-import org.opensaml.saml1.core.AttributeValue;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.opensaml.xml.schema.XSString;
-import org.opensaml.xml.schema.impl.XSStringBuilder;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-
-/**
- * Implementation of SAML 1.X attribute encoder.
- */
-public class SAML1StringAttributeEncoder extends AbstractSAML1AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML1StringAttributeEncoder.class);
-
-    /** XSString factory. */
-    private final XMLObjectBuilder<XSString> stringBuilder;
-
-    /** Constructor. */
-    public SAML1StringAttributeEncoder() {
-        super();
-        stringBuilder = new XSStringBuilder();
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        populateAttribute(samlAttribute);
-
-        String attributeValue;
-        XSString samlAttributeValue;
-        for (Object o : attribute.getValues()) {
-            if (o == null) {
-                continue;
-            }
-
-            attributeValue = o.toString();
-            if (!DatatypeHelper.isEmpty(attributeValue)) {
-                samlAttributeValue = stringBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME);
-                samlAttributeValue.setValue(attributeValue);
-                samlAttribute.getAttributeValues().add(samlAttributeValue);
-            }
-        }
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1StringNameIdentifierEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1StringNameIdentifierEncoder.java.svn-base
deleted file mode 100644
index 507d353..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1StringNameIdentifierEncoder.java.svn-base
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML1NameIdentifierEncoder;
-
-/**
- * An attribute encoder that takes the first value of an attribute and creates a {@link NameIdentifier} of it. Attribute
- * values are turned into the values for the NameIdentifier by invoking the values {@link Object#toString()} method.
- */
-public class SAML1StringNameIdentifierEncoder extends AbstractAttributeEncoder<NameIdentifier> implements
-        SAML1NameIdentifierEncoder {
-
-    /** Identifier builder. */
-    private SAMLObjectBuilder<NameIdentifier> identifierBuilder;
-
-    /** Format of the identifier. */
-    private String nameFormat;
-
-    /** Name qualifier for the identifier. */
-    private String nameQualifier;
-
-    /** Constructor. */
-    public SAML1StringNameIdentifierEncoder() {
-        identifierBuilder = (SAMLObjectBuilder<NameIdentifier>) Configuration.getBuilderFactory().getBuilder(
-                NameIdentifier.DEFAULT_ELEMENT_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public String getNameFormat() {
-        return nameFormat;
-    }
-
-    /** {@inheritDoc} */
-    public void setNameFormat(String format) {
-        nameFormat = DatatypeHelper.safeTrimOrNullString(format);
-    }
-
-    /** {@inheritDoc} */
-    public String getNameQualifier() {
-        return nameQualifier;
-    }
-
-    /** {@inheritDoc} */
-    public void setNameQualifier(String qualifier) {
-        nameQualifier = DatatypeHelper.safeTrimOrNullString(qualifier);
-    }
-
-    /** {@inheritDoc} */
-    public NameIdentifier encode(BaseAttribute attribute) throws AttributeEncodingException {
-        NameIdentifier nameId = identifierBuilder.buildObject();
-
-        if (attribute.getValues() == null || attribute.getValues().isEmpty()) {
-            throw new AttributeEncodingException(attribute.getId() 
-                    + " attribute does not contain any values to encode");
-        }
-        nameId.setNameIdentifier(attribute.getValues().iterator().next().toString());
-
-        if (nameFormat != null) {
-            nameId.setFormat(nameFormat);
-        }
-
-        if (nameQualifier != null) {
-            nameId.setNameQualifier(nameQualifier);
-        }
-
-        return nameId;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1XMLObjectAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1XMLObjectAttributeEncoder.java.svn-base
deleted file mode 100644
index 0cb3817..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML1XMLObjectAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.saml1.core.Attribute;
-import org.opensaml.saml1.core.AttributeValue;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.opensaml.xml.schema.XSAny;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-
-/** A SAML 1 encoder that uses {@link XMLObject} as the value for attribute values. */
-public class SAML1XMLObjectAttributeEncoder extends AbstractSAML1AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML1XMLObjectAttributeEncoder.class);
-
-    /** Builder of AttributeValue XMLObjects. */
-    private final XMLObjectBuilder<XSAny> attributeValueBuilder;
-
-    /** Constructor. */
-    public SAML1XMLObjectAttributeEncoder() {
-        super();
-        attributeValueBuilder = Configuration.getBuilderFactory().getBuilder(XSAny.TYPE_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) throws AttributeEncodingException {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        populateAttribute(samlAttribute);
-
-        XSAny samlAttributeValue;
-        for (Object o : attribute.getValues()) {
-            if (o == null || !(o instanceof XMLObject)) {
-                continue;
-            }
-
-            samlAttributeValue = attributeValueBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME);
-            samlAttributeValue.getUnknownXMLObjects().add((XMLObject) o);
-            samlAttribute.getAttributeValues().add(samlAttributeValue);
-        }
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2Base64AttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2Base64AttributeEncoder.java.svn-base
deleted file mode 100644
index 554bd3f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2Base64AttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.AttributeValue;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.opensaml.xml.schema.XSString;
-import org.opensaml.xml.schema.impl.XSStringBuilder;
-import org.opensaml.xml.util.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-
-/**
- * Implementation of SAML 2.0 attribute encoder. * This attribute encoder only operates of {@link BaseAttribute}s with
- * value of type <code>byte[]</code>.
- */
-public class SAML2Base64AttributeEncoder extends AbstractSAML2AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML2Base64AttributeEncoder.class);
-
-    /** XSString factory. */
-    private final XMLObjectBuilder<XSString> stringBuilder;
-
-    /** Constructor. */
-    public SAML2Base64AttributeEncoder() {
-        super();
-        stringBuilder = (XSStringBuilder) Configuration.getBuilderFactory().getBuilder(XSString.TYPE_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        populateAttribute(samlAttribute);
-
-        byte[] attributeValue;
-        XSString samlAttributeValue;
-        for (Object o : attribute.getValues()) {
-            if (o == null || !(o instanceof byte[])) {
-                log.debug("Skipping attribute value because it is either null or not a byte[]");
-                continue;
-            }
-
-            attributeValue = (byte[]) o;
-            samlAttributeValue = stringBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME);
-            samlAttributeValue.setValue(Base64.encodeBytes(attributeValue));
-            samlAttribute.getAttributeValues().add(samlAttributeValue);
-        }
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2ScopedStringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2ScopedStringAttributeEncoder.java.svn-base
deleted file mode 100644
index e793140..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2ScopedStringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.AttributeValue;
-import org.opensaml.saml2.core.impl.AttributeBuilder;
-import org.opensaml.xml.XMLObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML2AttributeEncoder;
-
-/**
- * Implementation of SAML 2.0 scoped attribute encoder.
- */
-public class SAML2ScopedStringAttributeEncoder extends
-        AbstractScopedAttributeEncoder<org.opensaml.saml2.core.Attribute> implements SAML2AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML2ScopedStringAttributeEncoder.class);
-
-    /** Builder for SAML 2 attribute XMLObjects. */
-    private final SAMLObjectBuilder<Attribute> attributeBuilder;
-
-    /** Format of attribute. */
-    private String format;
-
-    /** Friendly name of attribute. */
-    private String friendlyName;
-
-    /** Constructor. */
-    public SAML2ScopedStringAttributeEncoder() {
-        super();
-
-        attributeBuilder = (AttributeBuilder) Configuration.getBuilderFactory().getBuilder(
-                Attribute.DEFAULT_ELEMENT_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public String getNameFormat() {
-        return format;
-    }
-
-    /** {@inheritDoc} */
-    public String getFriendlyName() {
-        return friendlyName;
-    }
-
-    /** {@inheritDoc} */
-    public void setNameFormat(String newFormat) {
-        format = newFormat;
-    }
-
-    /** {@inheritDoc} */
-    public void setFriendlyName(String name) {
-        friendlyName = name;
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) throws AttributeEncodingException {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        samlAttribute.setName(getAttributeName());
-        samlAttribute.setNameFormat(getNameFormat());
-        samlAttribute.setFriendlyName(getFriendlyName());
-        samlAttribute.getAttributeValues()
-                .addAll(encodeAttributeValues(AttributeValue.DEFAULT_ELEMENT_NAME, attribute));
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2StringAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2StringAttributeEncoder.java.svn-base
deleted file mode 100644
index d5d5659..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2StringAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.AttributeValue;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.opensaml.xml.schema.XSString;
-import org.opensaml.xml.schema.impl.XSStringBuilder;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-
-/**
- * Implementation of SAML 2.0 attribute encoder.
- */
-public class SAML2StringAttributeEncoder extends AbstractSAML2AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML2StringAttributeEncoder.class);
-
-    /** XSString factory. */
-    private final XMLObjectBuilder<XSString> stringBuilder;
-
-    /** Constructor. */
-    public SAML2StringAttributeEncoder() {
-        super();
-        stringBuilder = (XSStringBuilder) Configuration.getBuilderFactory().getBuilder(XSString.TYPE_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        populateAttribute(samlAttribute);
-
-        String attributeValue;
-        XSString samlAttributeValue;
-        for (Object o : attribute.getValues()) {
-            if (o == null) {
-                continue;
-            }
-
-            attributeValue = o.toString();
-            if (!(DatatypeHelper.isEmpty(attributeValue))) {
-                samlAttributeValue = stringBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME);
-                samlAttributeValue.setValue(attributeValue);
-                samlAttribute.getAttributeValues().add(samlAttributeValue);
-            }
-        }
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2StringNameIDEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2StringNameIDEncoder.java.svn-base
deleted file mode 100644
index ce70b84..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2StringNameIDEncoder.java.svn-base
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml2.core.NameID;
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML2NameIDEncoder;
-
-/**
- * An attribute encoder that takes the first value of an attribute and creates a {@link NameID} of it. Attribute values
- * are turned into the values for the NameID by invoking the values {@link Object#toString()} method.
- */
-public class SAML2StringNameIDEncoder extends AbstractAttributeEncoder<NameID> implements SAML2NameIDEncoder {
-
-    /** NameID builder object. */
-    private SAMLObjectBuilder<NameID> nameIdBuilder;
-
-    /** Format of the NameID. */
-    private String nameFormat;
-
-    /** Name qualifier for the NameID. */
-    private String nameQualifier;
-
-    /** Constructor. */
-    public SAML2StringNameIDEncoder() {
-        nameIdBuilder = (SAMLObjectBuilder<NameID>) Configuration.getBuilderFactory().getBuilder(
-                NameID.DEFAULT_ELEMENT_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public NameID encode(BaseAttribute attribute) throws AttributeEncodingException {
-        NameID nameId = nameIdBuilder.buildObject();
-
-        if (attribute.getValues() == null || attribute.getValues().isEmpty()) {
-            throw new AttributeEncodingException(attribute.getId() + " attribute does not contain any values to encode");
-        }
-        nameId.setValue(attribute.getValues().iterator().next().toString());
-
-        if (nameFormat != null) {
-            nameId.setFormat(nameFormat);
-        }
-
-        if (nameQualifier != null) {
-            nameId.setNameQualifier(nameQualifier);
-        }
-
-        return nameId;
-    }
-
-    /** {@inheritDoc} */
-    public String getNameFormat() {
-        return nameFormat;
-    }
-
-    /** {@inheritDoc} */
-    public void setNameFormat(String format) {
-        nameFormat = DatatypeHelper.safeTrimOrNullString(format);
-    }
-
-    /** {@inheritDoc} */
-    public String getNameQualifier() {
-        return nameQualifier;
-    }
-
-    /** {@inheritDoc} */
-    public void setNameQualifier(String qualifier) {
-        nameQualifier = DatatypeHelper.safeTrimOrNullString(qualifier);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2XMLObjectAttributeEncoder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2XMLObjectAttributeEncoder.java.svn-base
deleted file mode 100644
index 3a139df..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/encoding/provider/.svn/text-base/SAML2XMLObjectAttributeEncoder.java.svn-base
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.encoding.provider;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.AttributeValue;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.opensaml.xml.schema.XSAny;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-
-/** A SAML 2 encoder that uses {@link XMLObject} as the value for attribute values. */
-public class SAML2XMLObjectAttributeEncoder extends AbstractSAML2AttributeEncoder {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAML2XMLObjectAttributeEncoder.class);
-
-    /** Builder of AttributeValue XMLObjects. */
-    private final XMLObjectBuilder<XSAny> attributeValueBuilder;
-
-    /** Constructor. */
-    public SAML2XMLObjectAttributeEncoder() {
-        super();
-        attributeValueBuilder = Configuration.getBuilderFactory().getBuilder(XSAny.TYPE_NAME);
-    }
-
-    /** {@inheritDoc} */
-    public Attribute encode(BaseAttribute attribute) throws AttributeEncodingException {
-        Attribute samlAttribute = attributeBuilder.buildObject();
-        populateAttribute(samlAttribute);
-
-        XSAny samlAttributeValue;
-        for (Object o : attribute.getValues()) {
-            if (o == null || !(o instanceof XMLObject)) {
-                continue;
-            }
-
-            samlAttributeValue = attributeValueBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME);
-            samlAttributeValue.getUnknownXMLObjects().add((XMLObject) o);
-            samlAttribute.getAttributeValues().add(samlAttributeValue);
-        }
-
-        List<XMLObject> attributeValues = samlAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Unable to encode {} attribute.  It does not contain any values", attribute.getId());
-            return null;
-        }
-
-        return samlAttribute;
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops
deleted file mode 100644
index dca638a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering
-END
-AttributeFilteringException.java
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/AttributeFilteringException.java
-END
-AttributeFilteringEngine.java
-K 25
-svn:wc:ra_dav:version-url
-V 152
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/AttributeFilteringEngine.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries
deleted file mode 100644
index c514b8d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries
+++ /dev/null
@@ -1,99 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-provider
-dir
-

-AttributeFilteringEngine.java
-file
-
-
-
-
-2014-02-19T17:27:42.166766Z
-28335bbbf9b560d1f067823d16190d24
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2155
-

-AttributeFilteringException.java
-file
-
-
-
-
-2014-02-19T17:27:42.166766Z
-5a8043187f5ced9b8a932c6aadfd09b5
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2022
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/AttributeFilteringEngine.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/AttributeFilteringEngine.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/AttributeFilteringEngine.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/AttributeFilteringException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/AttributeFilteringException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/AttributeFilteringException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/AttributeFilteringEngine.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/AttributeFilteringEngine.java.svn-base
deleted file mode 100644
index 05ea25e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/AttributeFilteringEngine.java.svn-base
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering;
-
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestContext;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-
-/**
- * The engine that applies attribute acceptance policies to a collection of attributes.
- * 
- * @param <ContextType> type of request context expected by this filtering engine
- */
-public interface AttributeFilteringEngine<ContextType extends AttributeRequestContext> {
-
-    /**
-     * Filters values for the given attribute, removing or allowing attributes per some implementation specific policy.
-     * This filtering process may remove attributes with no values but must not add attributes or attribute values.
-     * 
-     * @param attributes attributes to be filtered
-     * @param context attribute request context
-     * 
-     * @return the filtered attributes, attribute ID is the key, attribute object is the value
-     * 
-     * @throws AttributeFilteringException thrown if there is a problem retrieving or applying the attribute acceptance
-     *             policy
-     */
-    public Map<String, BaseAttribute> filterAttributes(Map<String, BaseAttribute> attributes, ContextType context)
-            throws AttributeFilteringException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/AttributeFilteringException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/AttributeFilteringException.java.svn-base
deleted file mode 100644
index c4db247..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/AttributeFilteringException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestException;
-
-/** General attribute acceptance policy exception. */
-public class AttributeFilteringException extends AttributeRequestException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 8238837019955732757L;
-
-    /**
-     * Constructor.
-     */
-    public AttributeFilteringException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public AttributeFilteringException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeFilteringException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeFilteringException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops
deleted file mode 100644
index 6dfc778..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 132
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider
-END
-AttributeFilterPolicy.java
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/AttributeFilterPolicy.java
-END
-AttributeRule.java
-K 25
-svn:wc:ra_dav:version-url
-V 150
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/AttributeRule.java
-END
-ShibbolethFilteringContext.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/ShibbolethFilteringContext.java
-END
-MatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 149
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/MatchFunctor.java
-END
-FilterProcessingException.java
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/FilterProcessingException.java
-END
-ShibbolethAttributeFilteringEngine.java
-K 25
-svn:wc:ra_dav:version-url
-V 171
-/java-shib-common/!svn/ver/998/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/ShibbolethAttributeFilteringEngine.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries
deleted file mode 100644
index 9abbb49..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries
+++ /dev/null
@@ -1,235 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeFilterPolicy.java
-file
-
-
-
-
-2014-02-19T17:27:42.162766Z
-dd8a3cbc4cef58937e95fe4c2f7d3fba
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2533
-

-AttributeRule.java
-file
-
-
-
-
-2014-02-19T17:27:42.162766Z
-94dc99b23f7d476a46c187bf572b4d45
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2745
-

-match
-dir
-

-ShibbolethFilteringContext.java
-file
-
-
-
-
-2014-02-19T17:27:42.162766Z
-9df12fa21417b1dadffbcfa1a28cf95c
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4391
-

-MatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.162766Z
-5f5ccca7227ea45e9304a708ccf803fb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2952
-

-FilterProcessingException.java
-file
-
-
-
-
-2014-02-19T17:27:42.162766Z
-2bc91c2f2194a09ad240fb015f5b7a5b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2102
-

-ShibbolethAttributeFilteringEngine.java
-file
-
-
-
-
-2014-02-19T17:27:42.162766Z
-e8995adbc4e60a1dca4910c2df639efe
-2011-07-28T12:04:20.655339Z
-998
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11632
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/AttributeFilterPolicy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/AttributeFilterPolicy.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/AttributeFilterPolicy.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/AttributeRule.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/AttributeRule.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/AttributeRule.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/FilterProcessingException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/FilterProcessingException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/FilterProcessingException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/MatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/MatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/MatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethAttributeFilteringEngine.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethAttributeFilteringEngine.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethAttributeFilteringEngine.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethFilteringContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethFilteringContext.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethFilteringContext.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/AttributeFilterPolicy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/AttributeFilterPolicy.java.svn-base
deleted file mode 100644
index b633fe2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/AttributeFilterPolicy.java.svn-base
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A policy describing if a set of attribute value filters is applicable.
- */
-public class AttributeFilterPolicy {
-
-    /** Unique identifier for this policy. */
-    private String policyId;
-    
-    /** Requirement that must be met for this policy to apply. */
-    private MatchFunctor policyRequirementRule;
-
-    /** Filters to be used on attribute values. */
-    private List<AttributeRule> attributeRules;
-
-    /**
-     * Constructor.
-     * 
-     * @param id unique ID for the policy
-     */
-    public AttributeFilterPolicy(String id) {
-        policyId = id;
-        attributeRules = new ArrayList<AttributeRule>();
-    }
-    
-    /**
-     * Gets the unique ID for this policy.
-     * 
-     * @return unique ID for this policy
-     */
-    public String getPolicyId(){
-        return policyId;
-    }
-
-    /**
-     * Gets the requirement for this policy.
-     * 
-     * @return requirement for this policy
-     */
-    public MatchFunctor getPolicyRequirementRule() {
-        return policyRequirementRule;
-    }
-
-    /**
-     * Sets the requirement for this policy.
-     * 
-     * @param requirement requirement for this policy
-     */
-    public void setPolicyRequirementRule(MatchFunctor requirement) {
-        policyRequirementRule = requirement;
-    }
-    
-    /**
-     * Gets the attribute rules that are in effect if this policy is in effect.
-     * 
-     * @return attribute rules that are in effect if this policy is in effect, never null
-     */
-    public List<AttributeRule> getAttributeRules(){
-        return attributeRules;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/AttributeRule.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/AttributeRule.java.svn-base
deleted file mode 100644
index ddb51ce..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/AttributeRule.java.svn-base
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider;
-
-/**
- * Represents a value filtering rule for a particular attribute.
- */
-public class AttributeRule {
-
-    /** Unique ID of the attribute this rule applies to. */
-    private String attributeId;
-    
-    /** Filter that permits the release of attribute values. */
-    private MatchFunctor permitValueRule;
-    
-    /** Filter that denies the release of attribute values. */
-    private MatchFunctor denyValueRule;
-    
-    /**
-     * Constructor.
-     *
-     * @param id unique ID of this rule
-     */
-    public AttributeRule(String id){
-        attributeId = id;
-    }
-    
-    /**
-     * Gets the ID of the attribute to which this rule applies.
-     * 
-     * @return ID of the attribute to which this rule applies
-     */
-    public String getAttributeId(){
-        return attributeId;
-    }
-
-    /**
-     * Gets the filter that permits the release of attribute values.
-     * 
-     * @return filter that permits the release of attribute values
-     */
-    public MatchFunctor getPermitValueRule(){
-        return permitValueRule;
-    }
-    
-    /**
-     * Sets the filter that permits the release of attribute values.
-     * 
-     * @param filter filter that permits the release of attribute values
-     */
-    public void setPermitValueRule(MatchFunctor filter){
-        permitValueRule = filter;
-    }
-    
-    /**
-     * Gets the filter that denies the release of attribute values.
-     * 
-     * @return filter that denies the release of attribute values
-     */
-    public MatchFunctor getDenyValueRule() {
-        return denyValueRule;
-    }
-    
-    /**
-     * Sets the filter that denies the release of attribute values.
-     * 
-     * @param filter filter that denies the release of attribute values
-     */
-    public void setDenyValueRule(MatchFunctor filter) {
-        denyValueRule = filter;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/FilterProcessingException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/FilterProcessingException.java.svn-base
deleted file mode 100644
index 0d1b9b3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/FilterProcessingException.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.AttributeFilteringException;
-
-/**
- * An exception resulting from the application of an attribute acceptance policy to a collection of attributes.
- */
-public class FilterProcessingException extends AttributeFilteringException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = -3674729593708202825L;
-
-    /**
-     * Constructor.
-     */
-    public FilterProcessingException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public FilterProcessingException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public FilterProcessingException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public FilterProcessingException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/MatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/MatchFunctor.java.svn-base
deleted file mode 100644
index 83f8cfb..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/MatchFunctor.java.svn-base
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider;
-
-/**
- * A function that evaluates whether an expressed criteria is met by the current filter context.
- */
-public interface MatchFunctor {
-
-    /**
-     * Evaluates this matching criteria. This evaluation is used while the filtering engine determines policy
-     * applicability.
-     * 
-     * @param filterContext current filtering context
-     * 
-     * @return true if the criteria for this matching function are meant
-     * 
-     * @throws FilterProcessingException thrown if the function can not be evaluated
-     */
-    public boolean evaluatePolicyRequirement(ShibbolethFilteringContext filterContext) throws FilterProcessingException;
-    
-    /**
-     * Evaluates this matching criteria. This evaluation is used while the filtering engine evaluating permit value
-     * rules.
-     * 
-     * @param filterContext the current filtering context
-     * @param attributeId ID of the attribute being evaluated
-     * @param attributeValue value of the attribute being evaluated
-     * 
-     * @return true if the criteria for this matching function are meant
-     * 
-     * @throws FilterProcessingException thrown if the function can not be evaluated
-     */
-    public boolean evaluatePermitValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException;
-    
-    /**
-     * Evaluates this matching criteria. This evaluation is used while the filtering engine is evaluating deny value
-     * rules.
-     * 
-     * @param filterContext the current filtering context
-     * @param attributeId ID of the attribute being evaluated
-     * @param attributeValue value of the attribute being evaluated
-     * 
-     * @return true if the criteria for this matching function are meant
-     * 
-     * @throws FilterProcessingException thrown if the function can not be evaluated
-     */
-    public boolean evaluateDenyRule(ShibbolethFilteringContext filterContext, String attributeId, Object attributeValue)
-            throws FilterProcessingException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethAttributeFilteringEngine.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethAttributeFilteringEngine.java.svn-base
deleted file mode 100644
index f5b8502..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethAttributeFilteringEngine.java.svn-base
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.locks.Lock;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.AttributeFilteringEngine;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.AttributeFilteringException;
-import edu.internet2.middleware.shibboleth.common.config.BaseReloadableService;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/**
- * Implementation of {@link AttributeFilteringEngine}.
- */
-public class ShibbolethAttributeFilteringEngine extends BaseReloadableService implements
-        AttributeFilteringEngine<SAMLProfileRequestContext> {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethAttributeFilteringEngine.class);
-
-    /** List of unmodifiable loaded filter policies. */
-    private List<AttributeFilterPolicy> filterPolicies;
-
-    /** Constructor. */
-    public ShibbolethAttributeFilteringEngine() {
-        super();
-        filterPolicies = new ArrayList<AttributeFilterPolicy>();
-    }
-
-    /**
-     * Gets the filter policies active for this engine.
-     * 
-     * @return filter policies active for this engine
-     */
-    public List<AttributeFilterPolicy> getFilterPolicies() {
-        return filterPolicies;
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> filterAttributes(Map<String, BaseAttribute> attributes,
-            SAMLProfileRequestContext context) throws AttributeFilteringException {
-
-        log.debug(getId() + " filtering {} attributes for principal {}", attributes.size(), context.getPrincipalName());
-
-        if (attributes.size() == 0) {
-            return new HashMap<String, BaseAttribute>();
-        }
-
-        if (getFilterPolicies() == null) {
-            log.debug("No filter policies were loaded in {}, filtering out all attributes for {}", getId(), context
-                    .getPrincipalName());
-            return new HashMap<String, BaseAttribute>();
-        }
-
-        ShibbolethFilteringContext filterContext = new ShibbolethFilteringContext(attributes, context);
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        try{
-            for (AttributeFilterPolicy filterPolicy : filterPolicies) {
-                filterAttributes(filterContext, filterPolicy);
-                runDenyRules(filterContext);
-            }
-        }finally{
-            readLock.unlock();
-        }
-
-        Iterator<Entry<String, BaseAttribute>> attributeEntryItr = attributes.entrySet().iterator();
-        Entry<String, BaseAttribute> attributeEntry;
-        BaseAttribute attribute;
-        Collection retainedValues;
-        while (attributeEntryItr.hasNext()) {
-            attributeEntry = attributeEntryItr.next();
-            attribute = attributeEntry.getValue();
-            retainedValues = filterContext.getRetainedValues(attribute.getId(), false);
-            attribute.getValues().clear();
-            attribute.getValues().addAll(retainedValues);
-            if (attribute.getValues().size() == 0) {
-                log.debug("Removing attribute from return set, no more values: {}", attribute.getId());
-                attributeEntryItr.remove();
-            }else{
-                log.debug("Attribute {} has {} values after filtering", attribute.getId(), attribute
-                        .getValues().size());
-            }
-        }
-
-        log.debug("Filtered attributes for principal {}.  The following attributes remain: {}", context
-                .getPrincipalName(), attributes.keySet());
-        return attributes;
-    }
-
-    /**
-     * Evaluates the given policy's requirement and, if the requirement is met, filters the attributes according to the
-     * policy.
-     * 
-     * @param filterContext current filtering context
-     * @param filterPolicy current filter policy
-     * 
-     * @throws FilterProcessingException thrown if the given policy can be evaluated
-     */
-    protected void filterAttributes(ShibbolethFilteringContext filterContext, AttributeFilterPolicy filterPolicy)
-            throws FilterProcessingException {
-        log.debug("Evaluating if filter policy {} is active for principal {}", filterPolicy.getPolicyId(),
-                filterContext.getAttributeRequestContext().getPrincipalName());
-        MatchFunctor policyRequirement = filterPolicy.getPolicyRequirementRule();
-        if (policyRequirement == null || !policyRequirement.evaluatePolicyRequirement(filterContext)) {
-            log.debug("Filter policy {} is not active for principal {}", filterPolicy.getPolicyId(), filterContext
-                    .getAttributeRequestContext().getPrincipalName());
-            return;
-        }
-
-        log.debug("Filter policy {} is active for principal {}", filterPolicy.getPolicyId(), filterContext
-                .getAttributeRequestContext().getPrincipalName());
-        for (AttributeRule attributeRule : filterPolicy.getAttributeRules()) {
-            filterAttributes(filterContext, attributeRule);
-        }
-    }
-
-    /**
-     * Evaluates the given attribute rule. If the attribute rule contains a permit value rule then that rule is
-     * evaluated against the unfiltered attributes and those values that meet the rule are moved into the filter
-     * contexts retained value set. If the attribute rule contains a deny value rule that rule is registered with the
-     * filter context so that it may be evaluated after all the permit value rules have run.
-     * 
-     * @param filterContext current filtering context
-     * @param attributeRule current attribute rule
-     * 
-     * @throws FilterProcessingException thrown if the given attribute rule can be evaluated
-     */
-    protected void filterAttributes(ShibbolethFilteringContext filterContext, AttributeRule attributeRule)
-            throws FilterProcessingException {
-        String attributeId = attributeRule.getAttributeId();
-
-        MatchFunctor permitRule = attributeRule.getPermitValueRule();
-        if (permitRule != null) {
-            log.debug("Processing permit value rule for attribute {} for principal {}", attributeId, filterContext
-                    .getAttributeRequestContext().getPrincipalName());
-            BaseAttribute attribute = filterContext.getUnfilteredAttributes().get(attributeId);
-            if(attribute == null){
-                return;
-            }
-            
-            Collection unfilteredValues = attribute.getValues();
-            Collection retainedValues = filterContext.getRetainedValues(attributeId, false);
-            for (Object value : unfilteredValues) {
-                if (permitRule.evaluatePermitValue(filterContext, attributeId, value)) {
-                    log.trace("The following value for attribute {} meets the permit value rule: {}", attributeId,
-                            value == null ? "<null>" : value.toString());
-                    retainedValues.add(value);
-                } else {
-                    log.trace("The following value for attribute {} does not meet permit value rule: {}", attributeId,
-                            value == null ? "<null>" : value.toString());
-                }
-            }
-        }
-
-        MatchFunctor denyRule = attributeRule.getDenyValueRule();
-        if (denyRule != null) {
-            log.debug("Registering deny value rule for attribute {} for principal {}", attributeId, filterContext
-                    .getAttributeRequestContext().getPrincipalName());
-            List<MatchFunctor> denyRules = filterContext.getDenyValueRules().get(attributeId);
-
-            if (denyRules == null) {
-                denyRules = new ArrayList<MatchFunctor>();
-                filterContext.getDenyValueRules().put(attributeId, denyRules);
-            }
-
-            denyRules.add(denyRule);
-        }
-    }
-
-    /**
-     * Runs the deny rules registered with the filter context upon the retained value set.
-     * 
-     * @param filterContext current filtering context
-     * 
-     * @throws FilterProcessingException thrown if there is a problem evaluating a deny value rule
-     */
-    protected void runDenyRules(ShibbolethFilteringContext filterContext) throws FilterProcessingException {
-        Map<String, List<MatchFunctor>> denyRuleEntries = filterContext.getDenyValueRules();
-        if (denyRuleEntries.isEmpty()) {
-            return;
-        }
-
-        List<MatchFunctor> denyRules;
-        Collection attributeValues;
-        Object attributeValue;
-        for (Entry<String, List<MatchFunctor>> denyRuleEntry : denyRuleEntries.entrySet()) {
-            denyRules = denyRuleEntry.getValue();
-            attributeValues = filterContext.getRetainedValues(denyRuleEntry.getKey(), false);
-            if (denyRules.isEmpty() || attributeValues.isEmpty()) {
-                continue;
-            }
-
-            Iterator<?> attributeValueItr = attributeValues.iterator();
-            for (MatchFunctor denyRule : denyRules) {
-                while (attributeValueItr.hasNext()) {
-                    attributeValue = attributeValueItr.next();
-                    if (denyRule.evaluateDenyRule(filterContext, denyRuleEntry.getKey(), attributeValue)) {
-                        log.trace("Removing the following value of attribute {} per deny rule: {}", denyRuleEntry
-                                .getKey(), attributeValue);
-                        attributeValueItr.remove();
-                    }
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected void onNewContextCreated(ApplicationContext newServiceContext) throws ServiceException {
-        List<AttributeFilterPolicy> oldFilterPolicies = filterPolicies;
-
-        try {
-            List<AttributeFilterPolicy> newFilterPolicies = new ArrayList<AttributeFilterPolicy>();
-            String[] beanNames = newServiceContext.getBeanNamesForType(AttributeFilterPolicy.class);
-            for (String beanName : beanNames) {
-                newFilterPolicies.add((AttributeFilterPolicy) newServiceContext.getBean(beanName));
-            }
-            filterPolicies = newFilterPolicies;
-        } catch (Exception e) {
-            filterPolicies = oldFilterPolicies;
-            throw new ServiceException(getId() + " configuration is not valid, retaining old configuration", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethFilteringContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethFilteringContext.java.svn-base
deleted file mode 100644
index f124183..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethFilteringContext.java.svn-base
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.opensaml.xml.util.LazySet;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-
-/**
- * Contextual information for performing attribute filtering.
- */
-public class ShibbolethFilteringContext {
-
-    /** The attribute request. */
-    private SAMLProfileRequestContext attributeRequestContext;
-
-    /** Attributes being filtered. */
-    private Map<String, BaseAttribute> unfilteredAttributes;
-
-    /** Retained values for a given attribute. */
-    private Map<String, Collection> retainedValues;
-
-    /** Deny value rules that apply to the attribute identified by the map key. */
-    private Map<String, List<MatchFunctor>> denyValueRules;
-
-    /**
-     * Constructor.
-     * 
-     * @param attributes unfiltered attribute set
-     * @param context attribute request context
-     */
-    public ShibbolethFilteringContext(Map<String, BaseAttribute> attributes, SAMLProfileRequestContext context) {
-        attributeRequestContext = context;
-        unfilteredAttributes = attributes;
-        retainedValues = new HashMap<String, Collection>();
-        denyValueRules = new HashMap<String, List<MatchFunctor>>();
-    }
-
-    /**
-     * Gets the context for the attribute request.
-     * 
-     * @return context for the attribute request
-     */
-    public SAMLProfileRequestContext getAttributeRequestContext() {
-        return attributeRequestContext;
-    }
-
-    /**
-     * Gets the attributes being filtered.
-     * 
-     * @return attributes being filtered
-     */
-    public Map<String, BaseAttribute> getUnfilteredAttributes() {
-        return unfilteredAttributes;
-    }
-
-    /**
-     * Gets the values, for the given attribute, that have no yet been filtered out.
-     * 
-     * @param attributeId attribute to retrieve the values for
-     * @param prepopulate whether to pre-populate the retained value list from the unfiltered value list if there is
-     *            currently no set of values retained for the given attribute
-     * 
-     * @return attribute values not yet filtered out, never null
-     */
-    public Collection getRetainedValues(String attributeId, boolean prepopulate) {        
-        Collection attributeValues;
-        if (!retainedValues.containsKey(attributeId)) {
-            attributeValues = new LazySet();
-            retainedValues.put(attributeId, attributeValues);
-            
-            if (prepopulate) {
-                BaseAttribute attribute = unfilteredAttributes.get(attributeId);
-                if (attribute != null && attribute.getValues() != null) {
-                    for(Object value : attribute.getValues()){
-                        if(value != null){
-                            attributeValues.add(value);
-                        }
-                    }
-                }
-            }
-        } else {
-            attributeValues = retainedValues.get(attributeId);
-        }
-
-        return attributeValues;
-    }
-
-    /**
-     * Gets the deny value rules that apply to the attribute. The map key is the ID of the attribute, the value is a
-     * list of deny rules that apply to that attribute.
-     * 
-     * @return deny value rules that apply to the attribute
-     */
-    public Map<String, List<MatchFunctor>> getDenyValueRules() {
-        return denyValueRules;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops
deleted file mode 100644
index b79845d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 138
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries
deleted file mode 100644
index e4d84cf..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries
+++ /dev/null
@@ -1,34 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-saml
-dir
-

-basic
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops
deleted file mode 100644
index 891bc39..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops
+++ /dev/null
@@ -1,143 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 143
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic
-END
-AttributeRequesterRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 184
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeRequesterRegexMatchFunctor.java
-END
-AbstractRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AbstractRegexMatchFunctor.java
-END
-AbstractAttributeTargetedStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AbstractAttributeTargetedStringMatchFunctor.java
-END
-NotMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/NotMatchFunctor.java
-END
-AndMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AndMatchFunctor.java
-END
-AbstractAttributeTargetedRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 191
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AbstractAttributeTargetedRegexMatchFunctor.java
-END
-AbstractMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AbstractMatchFunctor.java
-END
-ScriptMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/ScriptMatchFunctor.java
-END
-AuthenticationMethodStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 187
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AuthenticationMethodStringMatchFunctor.java
-END
-PrincipalStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 176
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/PrincipalStringMatchFunctor.java
-END
-AuthenticationMethodRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AuthenticationMethodRegexMatchFunctor.java
-END
-PrincipalRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 175
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/PrincipalRegexMatchFunctor.java
-END
-OrMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/OrMatchFunctor.java
-END
-AttributeScopeStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeScopeStringMatchFunctor.java
-END
-AttributeIssuerStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeIssuerStringMatchFunctor.java
-END
-AttributeValueStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeValueStringMatchFunctor.java
-END
-AnyMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AnyMatchFunctor.java
-END
-AttributeScopeRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 180
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeScopeRegexMatchFunctor.java
-END
-NumOfAttributeValuesMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/NumOfAttributeValuesMatchFunctor.java
-END
-AttributeIssuerRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeIssuerRegexMatchFunctor.java
-END
-AttributeRequesterStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeRequesterStringMatchFunctor.java
-END
-AbstractStringMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 175
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AbstractStringMatchFunctor.java
-END
-AttributeValueRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 180
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeValueRegexMatchFunctor.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries
deleted file mode 100644
index 5144aa4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries
+++ /dev/null
@@ -1,810 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AuthenticationMethodStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-806c41ee9a3bcf89889f14e8be79bc3b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1919
-

-PrincipalStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-07ba73c39907fc9826c0c0a8eea3d6ab
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1888
-

-AuthenticationMethodRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-cea31af6f08a15c54702ef453651ae2d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1928
-

-PrincipalRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-488a1913ec995427abe7b5095ed1bbf7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1895
-

-OrMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-237c6424c2bb1a3b882a84cfbe018217
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2929
-

-AttributeScopeStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.046764Z
-ba4b4f340fe20852965bc96b9d704538
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3332
-

-AttributeIssuerStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.046764Z
-b7d232b04ee3512fe91007c4e163d349
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1909
-

-AttributeValueStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.046764Z
-a5e12829816dc5e085447f8c6d5a3654
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2411
-

-AnyMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.046764Z
-a1038d4cbb1df1d6474f3f6ac30bf48c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1731
-

-AttributeScopeRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-79f2065bcddeda4c3079217bfdb46519
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3374
-

-NumOfAttributeValuesMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-5098fd468df433a1bd5680c329aca995
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3143
-

-AttributeIssuerRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-4094fe8012d7992120ab954dada4fb76
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1916
-

-AttributeRequesterStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-2f890ae6a8221bde06a6efa72085adb0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1913
-

-AbstractStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-0f3542914c55d0e86106622ec0e4333b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2846
-

-AttributeValueRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-a00c5462c5037c47a4abc3921ade29e4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2444
-

-AttributeRequesterRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-342f15a0765992ca136b07e0d17b9d42
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1916
-

-AbstractRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-d5b220f0828958be671988e2c2f84f98
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2207
-

-AbstractAttributeTargetedStringMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-e558019fa3da9ed30fa46bcd3e48f2be
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1788
-

-NotMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.050764Z
-e462765d3d550d8a8c6511765055de68
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2675
-

-AbstractAttributeTargetedRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-27afc8c955ec63d6df49c09056e634b0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1791
-

-AndMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-2771ec769e3f179431723d7804f3e9fc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3189
-

-AbstractMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-38b2b7c0d34af03b7d911ff0275838f1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3539
-

-ScriptMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.054764Z
-da3f16dbbd95fff65f1c7f465a88a9ab
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5476
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractAttributeTargetedRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractAttributeTargetedRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractAttributeTargetedRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractAttributeTargetedStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractAttributeTargetedStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractAttributeTargetedStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AbstractStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AndMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AndMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AndMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AnyMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AnyMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AnyMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NotMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NotMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NotMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NumOfAttributeValuesMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NumOfAttributeValuesMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NumOfAttributeValuesMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/OrMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/OrMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/OrMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalStringMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/ScriptMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/ScriptMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/ScriptMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractAttributeTargetedRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractAttributeTargetedRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 5c7f71c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractAttributeTargetedRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * Base class for match functions that match a regular expresion against an attribute's value.
- */
-public abstract class AbstractAttributeTargetedRegexMatchFunctor extends AbstractRegexMatchFunctor {
-
-    /** ID of the attribute whose values will be evaluated. */
-    private String attributeId;
-
-    /**
-     * Gets the ID of the attribute whose values will be evaluated.
-     * 
-     * @return ID of the attribute whose values will be evaluated
-     */
-    public String getAttributeId() {
-        return attributeId;
-    }
-
-    /**
-     * Sets the ID of the attribute whose values will be evaluated.
-     * 
-     * @param id ID of the attribute whose values will be evaluated
-     */
-    public void setAttributeId(String id) {
-        attributeId = DatatypeHelper.safeTrimOrNullString(id);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractAttributeTargetedStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractAttributeTargetedStringMatchFunctor.java.svn-base
deleted file mode 100644
index ab075d2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractAttributeTargetedStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * Base class for match functions that match a string value against an attribute's value.
- */
-public abstract class AbstractAttributeTargetedStringMatchFunctor extends AbstractStringMatchFunctor {
-
-    /** ID of the attribute whose values will be evaluated. */
-    private String attributeId;
-
-    /**
-     * Gets the ID of the attribute whose values will be evaluated.
-     * 
-     * @return ID of the attribute whose values will be evaluated
-     */
-    public String getAttributeId() {
-        return attributeId;
-    }
-
-    /**
-     * Sets the ID of the attribute whose values will be evaluated.
-     * 
-     * @param id ID of the attribute whose values will be evaluated
-     */
-    public void setAttributeId(String id) {
-        attributeId = DatatypeHelper.safeTrimOrNullString(id);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractMatchFunctor.java.svn-base
deleted file mode 100644
index b0ef761..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Base class for {@link MatchFunctor}s that delegate the evaluation and negate the result if necessary.
- * 
- * This class provides an extension point for functionality across all match functors.
- */
-public abstract class AbstractMatchFunctor implements MatchFunctor {
-
-    /** {@inheritDoc} */
-    public boolean evaluatePolicyRequirement(ShibbolethFilteringContext filterContext) throws FilterProcessingException {
-        return doEvaluatePolicyRequirement(filterContext);
-    }
-
-    /** {@inheritDoc} */
-    public boolean evaluatePermitValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return doEvaluateValue(filterContext, attributeId, attributeValue);
-    }
-
-    /** {@inheritDoc} */
-    public boolean evaluateDenyRule(ShibbolethFilteringContext filterContext, String attributeId, Object attributeValue)
-            throws FilterProcessingException {
-        return evaluatePermitValue(filterContext, attributeId, attributeValue);
-    }
-
-    /**
-     * Evaluates this matching criteria. This evaluation is used while the filtering engine determines policy
-     * applicability.
-     * 
-     * @param filterContext current filtering context
-     * 
-     * @return true if the criteria for this matching function are meant
-     * 
-     * @throws FilterProcessingException thrown if the function can not be evaluated
-     */
-    protected abstract boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException;
-
-    /**
-     * Evaluates this matching criteria. This evaluation is used while the filtering engine is evaluating either a deny
-     * or permit value rule.
-     * 
-     * @param filterContext the current filtering context
-     * @param attributeId ID of the attribute being evaluated
-     * @param attributeValue value of the attribute being evaluated
-     * 
-     * @return true if the criteria for this matching function are meant
-     * 
-     * @throws FilterProcessingException thrown if the function can not be evaluated
-     */
-    protected abstract boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 04f29ab..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import java.util.regex.Pattern;
-
-/**
- * Base class for match function that match a string value against a given regular expression.
- */
-public abstract class AbstractRegexMatchFunctor extends AbstractMatchFunctor {
-
-    /** Regular expression to match. */
-    private Pattern regex;
-
-    /**
-     * Gets the regular expression to match.
-     * 
-     * @return regular expression to match
-     */
-    public String getRegularExpression() {
-        return regex.pattern();
-    }
-
-    /**
-     * Sets the regular expression to match.
-     * 
-     * @param expression regular expression to match
-     */
-    public void setRegularExpression(String expression) {
-        regex = Pattern.compile(expression);
-    }
-
-    /**
-     * Matches the given value against the provided regular expression. {@link Object#toString()} is used to produce the
-     * string value to evaluate.
-     * 
-     * @param value the value to evaluate
-     * 
-     * @return true if the value matches the given match string, false if not
-     */
-    protected boolean isMatch(Object value) {
-        if (regex == null || value == null) {
-            return false;
-        }
-
-        if (regex.matcher(value.toString()).matches()) {
-            return true;
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractStringMatchFunctor.java.svn-base
deleted file mode 100644
index d3a59ed..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AbstractStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-/**
- * Base class for match function that match one string value against a given string value.
- */
-public abstract class AbstractStringMatchFunctor extends AbstractMatchFunctor {
-
-    /** String to match for a positive evaluation. */
-    private String matchString;
-
-    /** Whether the match evaluation is case sensitive. */
-    private boolean caseSensitive;
-
-    /**
-     * Gets the string to match for a positive evaluation.
-     * 
-     * @return string to match for a positive evaluation
-     */
-    public String getMatchString() {
-        return matchString;
-    }
-
-    /**
-     * Sets the string to match for a positive evaluation.
-     * 
-     * @param match string to match for a positive evaluation
-     */
-    public void setMatchString(String match) {
-        matchString = match;
-    }
-
-    /**
-     * Gets whether the match evaluation is case sensitive.
-     * 
-     * @return whether the match evaluation is case sensitive
-     */
-    public boolean isCaseSensitive() {
-        return caseSensitive;
-    }
-
-    /**
-     * Sets whether the match evaluation is case sensitive.
-     * 
-     * @param isCaseSensitive whether the match evaluation is case sensitive
-     */
-    public void setCaseSensitive(boolean isCaseSensitive) {
-        caseSensitive = isCaseSensitive;
-    }
-
-    /**
-     * Matches the given value against the provided match string. {@link Object#toString()} is used to produce the
-     * string value to evaluate.
-     * 
-     * @param value the value to evaluate
-     * 
-     * @return true if the value matches the given match string, false if not
-     */
-    protected boolean isMatch(Object value) {
-        if (value == null) {
-            return matchString == null;
-        }
-
-        if (caseSensitive) {
-            return value.toString().equals(matchString);
-        } else {
-            return value.toString().equalsIgnoreCase(matchString);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AndMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AndMatchFunctor.java.svn-base
deleted file mode 100644
index 6a09bbf..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AndMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import java.util.List;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A {@link MatchFunctor} that logical ANDs the results of contained functors.
- */
-public class AndMatchFunctor extends AbstractMatchFunctor {
-
-    /** Contained functors. */
-    private List<MatchFunctor> targetRules;
-
-    /**
-     * Constructor.
-     *
-     * @param rules rules to AND together
-     */
-    public AndMatchFunctor(List<MatchFunctor> rules){
-        targetRules = rules;
-    }
-    
-    /**
-     * Gets the functors whose results will be ANDed.
-     * 
-     * @return functors whose results will be ANDed
-     */
-    public List<MatchFunctor> getTargetRules() {
-        return targetRules;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-
-        if (targetRules == null  ||
-            targetRules.isEmpty()) {
-            //
-            // we should treat the null case the same as the empty list. 
-            // Based on a "default deny" we make AND(null) false, (just like
-            // if (null))
-            //
-            return false;
-        }
-
-        for (MatchFunctor child : targetRules) {
-            if (!child.evaluatePolicyRequirement(filterContext)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        if (targetRules == null ||
-            targetRules.isEmpty()) {
-            //
-            // Treat the null case the same as the empty list. 
-            //
-            return false;
-        }
-
-        for (MatchFunctor child : targetRules) {
-            if (!child.evaluatePermitValue(filterContext, attributeId, attributeValue)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AnyMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AnyMatchFunctor.java.svn-base
deleted file mode 100644
index 3fb6352..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AnyMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that returns true to evaluations. Note, the result may still be negated.
- */
-public class AnyMatchFunctor extends AbstractMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 74b942c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if the attribute issuer matches the provided regular expression.
- */
-public class AttributeIssuerRegexMatchFunctor extends AbstractRegexMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getOutboundMessageIssuer());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getOutboundMessageIssuer());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctor.java.svn-base
deleted file mode 100644
index aca2a01..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if the attribute issuer matches the given match string.
- */
-public class AttributeIssuerStringMatchFunctor extends AbstractStringMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getOutboundMessageIssuer());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getOutboundMessageIssuer());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 166c650..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if attribute requester matches the provided regular expression.
- */
-public class AttributeRequesterRegexMatchFunctor extends AbstractRegexMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getInboundMessageIssuer());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getInboundMessageIssuer());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctor.java.svn-base
deleted file mode 100644
index ee8b836..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if the attribute requester matches the given match string.
- */
-public class AttributeRequesterStringMatchFunctor extends AbstractStringMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getInboundMessageIssuer());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getInboundMessageIssuer());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 5fcbc6e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import java.util.Collection;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-
-/**
- * Match functor that checks if an attribute's scoped values are equal to a given regular expression.
- * 
- * Attribute values evaluated by this functor <strong>must</strong> be of type {@link ScopedAttributeValue}.
- */
-public class AttributeScopeRegexMatchFunctor extends AbstractAttributeTargetedRegexMatchFunctor {
-
-    /**
-     * Checks if the given attribute value's scope matchs the given regular expression.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(((ScopedAttributeValue) attributeValue).getScope());
-    }
-
-    /**
-     * Checks if any of the scopes for the values of the given attribute match the given regular expression.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        BaseAttribute attribute = filterContext.getUnfilteredAttributes().get(getAttributeId());
-
-        if (attribute != null) {
-            ScopedAttributeValue value;
-            Collection values = attribute.getValues();
-
-            //
-            // Let's make some sense of this. If there are values, then we look at every member.
-            // If the member is a scopedAttribute we will look at the scope and see if it fits.
-            // Otherwise keep on going - we may find something which fits. If we get to the end
-            // and nothing has fit, say false.
-            //
-
-            if (values != null) {
-                for (Object object : values) {
-                    if (object instanceof ScopedAttributeValue) {
-                        value = (ScopedAttributeValue) object;
-                        if (isMatch(value.getScope())) {
-                            return true;
-
-                        }
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeStringMatchFunctor.java.svn-base
deleted file mode 100644
index a1ddeab..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import java.util.Collection;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-
-/**
- * Match functor that checks if an attribute's scoped values are equal to a given string.
- * 
- * Attribute values evaluated by this functor <strong>must</strong> be of type {@link ScopedAttributeValue}.
- */
-public class AttributeScopeStringMatchFunctor extends AbstractAttributeTargetedStringMatchFunctor {
-
-    /**
-     * Checks if the given attribute value's scope matchs the given string.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(((ScopedAttributeValue) attributeValue).getScope());
-    }
-
-    /**
-     * Checks if any of the scopes for the values of the given attribute match the given string.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        BaseAttribute attribute = filterContext.getUnfilteredAttributes().get(getAttributeId());
-        if (attribute == null) {
-            return false;
-        }
-        
-        Collection values = attribute.getValues();
-        ScopedAttributeValue scoped;
-  
-        //
-        // Let's make some sense of this.  If there are values, then we look at every member.
-        // If the member is a scopedAttribute we will look at the scope and see if it fits.
-        // Otherwise keep on going - we may find something which fits.  If we get to the end
-        // and nothing has fit, say false.
-        //
-
-        if (values != null) {
-            for (Object value : values) {
-                if (value instanceof ScopedAttributeValue) {
-                    scoped = (ScopedAttributeValue) value;
-                    if (isMatch(scoped.getScope())) {
-                        return true;
-                    }                  
-                } 
-            }
-        }
-        
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 2e58be4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates an attribute's value against the provided regular expression.
- */
-public class AttributeValueRegexMatchFunctor extends AbstractAttributeTargetedRegexMatchFunctor {
-
-    /**
-     * Evaluates to true if any value for the specified attribute matches the provided regular expression.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        BaseAttribute attribute = filterContext.getUnfilteredAttributes().get(getAttributeId());
-        
-        if (attribute != null && attribute.getValues() != null) {
-            for (Object value : attribute.getValues()) {
-                if (isMatch(value)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Evaluates to true if the given attribute value matches the provided regular expression.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String id, Object attributeValue)
-            throws FilterProcessingException {
-
-        return isMatch(attributeValue);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueStringMatchFunctor.java.svn-base
deleted file mode 100644
index d64a529..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates an attribute's value against the given match string.
- */
-public class AttributeValueStringMatchFunctor extends AbstractAttributeTargetedStringMatchFunctor {
-
-    /**
-     * Evaluates to true if any value for the specified attribute matches the given match string.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        BaseAttribute attribute = filterContext.getUnfilteredAttributes().get(getAttributeId());
-        if (attribute != null && attribute.getValues() != null) {
-            for (Object value : attribute.getValues()) {
-                if (isMatch(value)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Evaluates to true if the given attribute value matches the given match string.
-     * 
-     * {@inheritDoc}
-     */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String id, Object attributeValue)
-            throws FilterProcessingException {
-
-        return isMatch(attributeValue);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 02f20ff..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Match functor that compares the user's authentication method against a given regular expresion.
- */
-public class AuthenticationMethodRegexMatchFunctor extends AbstractRegexMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalAuthenticationMethod());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalAuthenticationMethod());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctor.java.svn-base
deleted file mode 100644
index 3075fb0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Match functor that compares the user's authentication method against a given string.
- */
-public class AuthenticationMethodStringMatchFunctor extends AbstractStringMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalAuthenticationMethod());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalAuthenticationMethod());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NotMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NotMatchFunctor.java.svn-base
deleted file mode 100644
index 8332cc9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NotMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match functor that performs a logical NOT on the result of another functor.
- */
-public class NotMatchFunctor extends AbstractMatchFunctor {
-
-    /** Match functor to negate. */
-    private MatchFunctor targetRule;
-    
-    /**
-     * Constructor.
-     *
-     * @param rule rule to NOT
-     */
-    public NotMatchFunctor(MatchFunctor rule){
-        targetRule = rule;
-    }
-
-    /**
-     * Gets the match functor that will be the target of the logical NOT.
-     * 
-     * @return match functor that will be the target of the logical NOT
-     */
-    public MatchFunctor getTargetRule() {
-        return targetRule;
-    }
-
-    /**
-     * Sets the match functor that will be the target of the logical NOT.
-     * 
-     * @param target match functor that will be the target of the logical NOT
-     */
-    public void setTargetRule(MatchFunctor target) {
-        targetRule = target;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return !targetRule.evaluatePermitValue(filterContext, attributeId, attributeValue);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return !targetRule.evaluatePolicyRequirement(filterContext);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NumOfAttributeValuesMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NumOfAttributeValuesMatchFunctor.java.svn-base
deleted file mode 100644
index 5dbf4e2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NumOfAttributeValuesMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match functor that checks if the given attribute has more than the minimum number of values but less than the
- * maximum.
- */
-public class NumOfAttributeValuesMatchFunctor extends AbstractMatchFunctor {
-
-    /** ID of the attribute that will be checked. */
-    private String attributeId;
-
-    /** Minimum allowed number of attribute values. */
-    private int minimumValues;
-
-    /** Maximum allowed number of attribute values. */
-    private int maximumValues;
-
-    /**
-     * Constructor.
-     * 
-     * @param id ID of the attribute to be checked
-     * @param min minimum number of values allowed
-     * @param max maximum number of values allowed
-     */
-    public NumOfAttributeValuesMatchFunctor(String id, int min, int max) {
-        attributeId = id;
-        minimumValues = min;
-        maximumValues = max;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isWithinRange(filterContext.getUnfilteredAttributes().get(attributeId));
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String id, Object value)
-            throws FilterProcessingException {
-        return isWithinRange(filterContext.getUnfilteredAttributes().get(attributeId));
-    }
-
-    /**
-     * Checks that the number of values for the given attribute is within the given range.
-     * 
-     * @param attribute attribute to check
-     * 
-     * @return true if the attribute has more than the minimum number of values and less than the maximum.
-     */
-    protected boolean isWithinRange(BaseAttribute attribute) {
-        if (attribute == null) {
-            return false;
-        }
-
-        int numOfValues = attribute.getValues().size();
-
-        return numOfValues >= minimumValues && numOfValues <= maximumValues;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/OrMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/OrMatchFunctor.java.svn-base
deleted file mode 100644
index ee8c031..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/OrMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import java.util.List;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that logical ORs the results of contained functors.
- */
-public class OrMatchFunctor extends AbstractMatchFunctor {
-
-    /** Contained functors. */
-    private List<MatchFunctor> targetRules;
-    
-    /**
-     * Constructor.
-     *
-     * @param rules rules to AND together
-     */
-    public OrMatchFunctor(List<MatchFunctor> rules){
-        targetRules = rules;
-    }
-
-    /**
-     * Gets the functors whose results will be ORed.
-     * 
-     * @return functors whose results will be ORed
-     */
-    public List<MatchFunctor> getTargetRules() {
-        return targetRules;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-
-        if (targetRules == null) {
-            //
-            // we should treat the null case the same as the empty list OR(null == OR({}) == FALSE
-            //
-            return false;
-        }
-
-        for (MatchFunctor child : targetRules) {
-            if (child.evaluatePolicyRequirement(filterContext)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        if (targetRules == null) {
-            return false;
-        }
-
-        for (MatchFunctor child : targetRules) {
-            if (child.evaluatePermitValue(filterContext, attributeId, attributeValue)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalRegexMatchFunctor.java.svn-base
deleted file mode 100644
index b154b18..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if user's principal name matches the provided regular expression.
- */
-public class PrincipalRegexMatchFunctor extends AbstractRegexMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalName());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalName());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalStringMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalStringMatchFunctor.java.svn-base
deleted file mode 100644
index 1edbb68..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalStringMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if user's principal name matches the given match string.
- */
-public class PrincipalStringMatchFunctor extends AbstractStringMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalName());
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isMatch(filterContext.getAttributeRequestContext().getPrincipalName());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/ScriptMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/ScriptMatchFunctor.java.svn-base
deleted file mode 100644
index 1405e17..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/ScriptMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import javax.script.SimpleScriptContext;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Match function based on a JSR-268 script.
- */
-public class ScriptMatchFunctor extends AbstractMatchFunctor {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ScriptMatchFunctor.class);
-
-    /** The scripting language. */
-    private String scriptLanguage;
-
-    /** The script to execute. */
-    private String script;
-
-    /** The script engine to execute the script. */
-    private ScriptEngine scriptEngine;
-
-    /** The compiled form of the script, if the script engine supports compiling. */
-    private CompiledScript compiledScript;
-
-    /**
-     * Constructor.
-     * 
-     * @param language the scripting language
-     * @param newScript the script to execute
-     */
-    public ScriptMatchFunctor(String language, String newScript) {
-        scriptLanguage = language;
-        script = newScript;
-
-        ScriptEngineManager sem = new ScriptEngineManager();
-        scriptEngine = sem.getEngineByName(scriptLanguage);
-        compileScript();
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        ScriptContext context = getScriptContext(filterContext, attributeId, attributeValue);
-        return executeScript(context);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        ScriptContext context = getScriptContext(filterContext, null, null);
-        return executeScript(context);
-    }
-
-    /** Compiles the script if the scripting engine supports it. */
-    protected void compileScript() {
-        if (DatatypeHelper.isEmpty(script)) {
-            return;
-        }
-
-        try {
-            if (scriptEngine != null && scriptEngine instanceof Compilable) {
-                compiledScript = ((Compilable) scriptEngine).compile(script);
-            }
-        } catch (ScriptException e) {
-            compiledScript = null;
-            log.warn("Unable to pre-compile JSR-268 script: " + script, e);
-        }
-    }
-
-    /**
-     * Creates the script execution context from the resolution context.
-     * 
-     * @param filterContext current resolution context
-     * @param attributeId ID of the attribute currently being evaluted
-     * @param attributeValue attribute currently being validated
-     * 
-     * @return constructed script context
-     */
-    protected ScriptContext getScriptContext(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) {
-        SimpleScriptContext scriptContext = new SimpleScriptContext();
-        scriptContext.setAttribute("filterContext", filterContext, ScriptContext.ENGINE_SCOPE);
-        scriptContext.setAttribute("attributeId", attributeId, ScriptContext.ENGINE_SCOPE);
-        scriptContext.setAttribute("attributeValue", attributeValue, ScriptContext.ENGINE_SCOPE);
-        return scriptContext;
-    }
-
-    /**
-     * Executes the functor's script.
-     * 
-     * @param scriptContext the script execution context
-     * 
-     * @return the result of the script
-     * 
-     * @throws FilterProcessingException thrown if there is a problem evaluating the script
-     */
-    protected Boolean executeScript(ScriptContext scriptContext) throws FilterProcessingException {
-        Boolean result;
-        try {
-            if (compiledScript != null) {
-                result = (Boolean) compiledScript.eval(scriptContext);
-            } else {
-                result = (Boolean) scriptEngine.eval(script, scriptContext);
-            }
-
-            if (result != null) {
-                return result.booleanValue();
-            } else {
-                return Boolean.FALSE;
-            }
-        } catch (ScriptException e) {
-            throw new FilterProcessingException("Unable to execute match functor script", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/all-wcprops
deleted file mode 100644
index a4dd86b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/all-wcprops
+++ /dev/null
@@ -1,89 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 143
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml
-END
-AbstractEntityAttributeExactMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 188
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeExactMatchFunctor.java
-END
-AttributeRequesterEntityAttributeExactMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 198
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterEntityAttributeExactMatchFunctor.java
-END
-AttributeIssuerEntityAttributeRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 195
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerEntityAttributeRegexMatchFunctor.java
-END
-AttributeIssuerNameIDFormatExactMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerNameIDFormatExactMatchFunctor.java
-END
-AttributeInMetadataMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 180
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeInMetadataMatchFunctor.java
-END
-AbstractEntityGroupMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 179
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityGroupMatchFunctor.java
-END
-AbstractEntityAttributeRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 188
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeRegexMatchFunctor.java
-END
-AttributeIssuerInEntityGroupMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 188
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerInEntityGroupMatchFunctor.java
-END
-AttributeRequesterEntityAttributeRegexMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 198
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterEntityAttributeRegexMatchFunctor.java
-END
-AttributeRequesterNameIDFormatExactMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 195
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterNameIDFormatExactMatchFunctor.java
-END
-AbstractNameIDFormatSupportedMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 189
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractNameIDFormatSupportedMatchFunctor.java
-END
-AbstractEntityAttributeMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 184
-/java-shib-common/!svn/ver/1005/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AbstractEntityAttributeMatchFunctor.java
-END
-AttributeIssuerEntityAttributeExactMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 195
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerEntityAttributeExactMatchFunctor.java
-END
-AttributeRequesterInEntityGroupMatchFunctor.java
-K 25
-svn:wc:ra_dav:version-url
-V 191
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterInEntityGroupMatchFunctor.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/entries
deleted file mode 100644
index ed218bf..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/entries
+++ /dev/null
@@ -1,504 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AbstractEntityGroupMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-5704bfbeca9fb0ec7bd31fa8f14704d0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3248
-

-AbstractEntityAttributeRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-c25ac94e97ecfb6f2e4d88783b5bfe3c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2177
-

-AttributeIssuerInEntityGroupMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-711b05ba1fb5efb9080edff44a59a60e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1930
-

-AttributeRequesterEntityAttributeRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-3cb444c4a9a3ced40e6622af31738dce
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1585
-

-AttributeRequesterNameIDFormatExactMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-fc06f1d575a52c1e055c8a35114caea5
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1685
-

-AbstractNameIDFormatSupportedMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.162766Z
-d973eb9fdbc8ccfe91035f6038f7ab8c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4457
-

-AbstractEntityAttributeMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.154766Z
-a8601f4dc425e63eb42fc6dd97a62f5b
-2011-09-07T19:54:52.473485Z
-1005
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9092
-

-AttributeIssuerEntityAttributeExactMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.154766Z
-f78c3f8d8b4e148744c1cc7a7fae0bf0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1557
-

-AttributeRequesterInEntityGroupMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.154766Z
-711503985b1c00d90535e2023946cba0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1934
-

-AbstractEntityAttributeExactMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.154766Z
-9d0318ec766652e30c2cb6d79dc14fff
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2020
-

-AttributeRequesterEntityAttributeExactMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-beb19d87da330cf1511fc2d78791fc3e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1562
-

-AttributeIssuerEntityAttributeRegexMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-a74594dfd4bf71ff08bac245ab3e77ad
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1580
-

-AttributeIssuerNameIDFormatExactMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-7a31049ec66f56f59355c065e90f1290
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1686
-

-AttributeInMetadataMatchFunctor.java
-file
-
-
-
-
-2014-02-19T17:27:42.158766Z
-e1a26690b918af6378061f243a81f0c9
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12538
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeExactMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityAttributeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityGroupMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityGroupMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractEntityGroupMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractNameIDFormatSupportedMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractNameIDFormatSupportedMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AbstractNameIDFormatSupportedMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeInMetadataMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeInMetadataMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeInMetadataMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeExactMatchFunctor.java.svn-base
deleted file mode 100644
index 4a4a681..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * Base class for match functors that perform an exact match of a given attribute string value against entity attribute
- * value.
- */
-public abstract class AbstractEntityAttributeExactMatchFunctor extends AbstractEntityAttributeMatchFunctor {
-
-    /** The value of the entity attribute the entity must have. */
-    private String value;
-
-    /**
-     * Gets the value of the entity attribute the entity must have.
-     * 
-     * @return value of the entity attribute the entity must have
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the entity attribute the entity must have.
-     * 
-     * @param attributeValue value of the entity attribute the entity must have
-     */
-    public void setValue(String attributeValue) {
-        value = attributeValue;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean entityAttributeValueMatches(String entityAttributeValue) {
-        return DatatypeHelper.safeEquals(getValue(), DatatypeHelper.safeTrim(entityAttributeValue));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeMatchFunctor.java.svn-base
deleted file mode 100644
index af2a035..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import java.util.List;
-
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.samlext.saml2mdattr.EntityAttributes;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.schema.XSAny;
-import org.opensaml.xml.schema.XSString;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AbstractMatchFunctor;
-
-/**
- * Base class for match functions that check whether a particular entity attribute is present and contains a given
- * value.
- */
-public abstract class AbstractEntityAttributeMatchFunctor extends AbstractMatchFunctor {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractEntityAttributeMatchFunctor.class);
-
-    /** The name of the entity attribute the entity must have. */
-    private String name;
-
-    /** The name format of the entity attribute the entity must have. */
-    private String nameFormat;
-
-    /**
-     * Gets the name of the entity attribute the entity must have.
-     * 
-     * @return name of the entity attribute the entity must have
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the name of the entity attribute the entity must have.
-     * 
-     * @param attributeName name of the entity attribute the entity must have
-     */
-    public void setName(String attributeName) {
-        name = attributeName;
-    }
-
-    /**
-     * Gets the name format of the entity attribute the entity must have.
-     * 
-     * @return name format of the entity attribute the entity must have
-     */
-    public String getNameFormat() {
-        return nameFormat;
-    }
-
-    /**
-     * Sets the name format of the entity attribute the entity must have.
-     * 
-     * @param attributeNameFormat name format of the entity attribute the entity must have
-     */
-    public void setNameFormat(String attributeNameFormat) {
-        nameFormat = DatatypeHelper.safeTrimOrNullString(attributeNameFormat);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return hasEntityAttribute(filterContext);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return hasEntityAttribute(filterContext);
-    }
-
-    /**
-     * Checks to see if the entity returned by {@link #getEntityMetadata(ShibbolethFilteringContext)} contains the
-     * entity attribute specified by this functor's configuration.
-     * 
-     * @param filterContext current request context
-     * 
-     * @return true if the entity has the configured attribute, false otherwise
-     */
-    protected boolean hasEntityAttribute(ShibbolethFilteringContext filterContext) {
-        EntityDescriptor entityDescriptor = getEntityMetadata(filterContext);
-        if (entityDescriptor == null) {
-            log.debug("No metadata available for the entity");
-            return false;
-        }
-
-        Attribute entityAttribute = getEntityAttribute(entityDescriptor);
-        if (entityAttribute == null) {
-            return false;
-        }
-
-        List<XMLObject> attributeValues = entityAttribute.getAttributeValues();
-        if (attributeValues == null || attributeValues.isEmpty()) {
-            log.debug("Entity attribute {} for entity {} does not contain any values", getName(),
-                    entityDescriptor.getEntityID());
-            return false;
-        }
-
-        log.debug("Checking if entity attribute {} contains the required value.", getName());
-        String valueString;
-        for (XMLObject attributeValue : attributeValues) {
-            if (attributeValue instanceof XSAny) {
-                valueString = ((XSAny) attributeValue).getTextContent();
-            } else if (attributeValue instanceof XSString) {
-                valueString = ((XSString) attributeValue).getValue();
-            } else {
-                log.debug("Entity attribute {} contains the unsupported value type {}, skipping it", getName(),
-                        attributeValue.getClass().getName());
-                continue;
-            }
-
-            if (valueString != null) {
-                if (entityAttributeValueMatches(valueString)) {
-                    log.debug("Entity attribute {} value {} meets matching requirements", getName(), valueString);
-                    return true;
-                }
-                log.debug("Entity attribute {} value {} does not meet matching requirements", getName(), valueString);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the entity descriptor for the entity to check.
-     * 
-     * @param filterContext current filter request context
-     * 
-     * @return entity descriptor for the entity to check
-     */
-    protected abstract EntityDescriptor getEntityMetadata(ShibbolethFilteringContext filterContext);
-
-    /**
-     * Gets the entity attribute from the given entity metadata. If both the attribute name and name format for this
-     * match functor is configured then both must match, otherwise only the attribute name must match.
-     * 
-     * @param entityDescriptor the metadata for the entity
-     * 
-     * @return the entity or null if the metadata does not contain such an entity attribute
-     */
-    protected Attribute getEntityAttribute(EntityDescriptor entityDescriptor) {
-        List<XMLObject> entityAttributesCollection = null;
-        if (entityDescriptor.getExtensions() != null) {
-            entityAttributesCollection = entityDescriptor.getExtensions().getUnknownXMLObjects(
-                    EntityAttributes.DEFAULT_ELEMENT_NAME);
-        }
-        if (entityAttributesCollection == null || entityAttributesCollection.isEmpty()) {
-            log.debug("Descriptor for {} does not contain any EntityAttributes", entityDescriptor.getEntityID());
-            return null;
-        }
-
-        if (entityAttributesCollection.size() > 1) {
-            log.debug("Descriptor for {} contains more than EntityAttributes extension, only using the first one",
-                    entityDescriptor.getEntityID());
-        }
-
-        List<Attribute> entityAttributes = ((EntityAttributes) entityAttributesCollection.get(0)).getAttributes();
-        if (entityAttributes == null || entityAttributes.isEmpty()) {
-            log.debug("EntityAttributes extension for {} does not contain any Attributes",
-                    entityDescriptor.getEntityID());
-            return null;
-        }
-
-        for (Attribute entityAttribute : entityAttributes) {
-            if (!DatatypeHelper.safeEquals(getName(), entityAttribute.getName())) {
-                continue;
-            }
-
-            if (getNameFormat() == null
-                    || (DatatypeHelper.safeEquals(getNameFormat(), entityAttribute.getNameFormat()))) {
-                log.debug("Descriptor for {} contains an entity attribute with the name {} and the format {}",
-                        new Object[] { entityDescriptor.getEntityID(), getName(), getNameFormat() });
-                return entityAttribute;
-            }
-        }
-
-        log.debug("Descriptor for {} does not contain an entity attribute with the name {} and the format {}",
-                new Object[] { entityDescriptor.getEntityID(), getName(), getNameFormat() });
-        return null;
-    }
-
-    /**
-     * Checks whether the given entity attribute value matches the rules for particular implementation of this functor.
-     * 
-     * @param entityAttributeValue the entity attribute value, never null
-     * 
-     * @return true if the value matches, false if not
-     */
-    protected abstract boolean entityAttributeValueMatches(String entityAttributeValue);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 18e1b8b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityAttributeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * Base class for match functors that perform an regular expression match of a given attribute string value against
- * entity attribute value.
- */
-public abstract class AbstractEntityAttributeRegexMatchFunctor extends AbstractEntityAttributeMatchFunctor {
-
-    /** The value of the entity attribute the entity must have. */
-    private Pattern valueRegex;
-
-    /**
-     * Gets the value of the entity attribute the entity must have.
-     * 
-     * @return value of the entity attribute the entity must have
-     */
-    public Pattern getValueRegex() {
-        return valueRegex;
-    }
-
-    /**
-     * Sets the value of the entity attribute the entity must have.
-     * 
-     * @param attributeValueRegex value of the entity attribute the entity must have
-     */
-    public void setValueRegex(Pattern attributeValueRegex) {
-        valueRegex = attributeValueRegex;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean entityAttributeValueMatches(String entityAttributeValue) {
-        Matcher valueMatcher = valueRegex.matcher(DatatypeHelper.safeTrim(entityAttributeValue));
-        return valueMatcher.matches();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityGroupMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityGroupMatchFunctor.java.svn-base
deleted file mode 100644
index 2572350..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractEntityGroupMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AbstractMatchFunctor;
-
-/**
- * Base class for match functors that check if a given entity is in an entity group.
- */
-public abstract class AbstractEntityGroupMatchFunctor extends AbstractMatchFunctor {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractEntityGroupMatchFunctor.class);
-
-    /** The entity group to match against. */
-    private String entityGroup;
-
-    /**
-     * Gets the entity group to match against.
-     * 
-     * @return entity group to match against
-     */
-    public String getEntityGroup() {
-        return entityGroup;
-    }
-
-    /**
-     * Sets the entity group to match against.
-     * 
-     * @param group entity group to match against
-     */
-    public void setEntityGroup(String group) {
-        entityGroup = DatatypeHelper.safeTrimOrNullString(group);
-    }
-
-    /**
-     * Checks if the given entity is in the provided entity group.
-     * 
-     * @param entity the entity to check
-     * 
-     * @return true if the entity is in the group, false if not
-     */
-    protected boolean isEntityInGroup(EntityDescriptor entity) {
-        if (entityGroup == null) {
-            log.debug("No entity group specified, unable to check if entity is in group");
-            return false;
-        }
-
-        if (entity == null) {
-            log.debug("No entity metadata available, unable to check if entity is in group {}", entityGroup);
-            return false;
-        }
-
-        EntitiesDescriptor currentGroup = (EntitiesDescriptor) entity.getParent();
-        if (currentGroup == null) {
-            log.debug("Entity descriptor does not have a parent object, unable to check if entity is in group {}",
-                    entityGroup);
-            return false;
-        }
-
-        do {
-            if (entityGroup.equals(currentGroup.getName())) {
-                return true;
-            }
-            currentGroup = (EntitiesDescriptor) currentGroup.getParent();
-        } while (currentGroup != null);
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractNameIDFormatSupportedMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractNameIDFormatSupportedMatchFunctor.java.svn-base
deleted file mode 100644
index debc64a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AbstractNameIDFormatSupportedMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import java.util.List;
-
-import org.opensaml.saml2.metadata.NameIDFormat;
-import org.opensaml.saml2.metadata.SSODescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AbstractMatchFunctor;
-
-/** Base class for matching functions that check if an SAML entity supports a particular NameID format type. */
-public abstract class AbstractNameIDFormatSupportedMatchFunctor extends AbstractMatchFunctor {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractNameIDFormatSupportedMatchFunctor.class);
-
-    /** The NameID format that needs to be supported by the entity. */
-    private String nameIdFormat;
-
-    /**
-     * Get the NameID format that needs to be supported by the entity.
-     * 
-     * @return NameID format that needs to be supported by the entity
-     */
-    public String getNameIdFormat() {
-        return nameIdFormat;
-    }
-
-    /**
-     * Sets the NameID format that needs to be supported by the entity.
-     * 
-     * @param format NameID format that needs to be supported by the entity
-     */
-    public void setNameIdFormat(String format) {
-        nameIdFormat = format;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isNameIDFormatSupported(filterContext);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isNameIDFormatSupported(filterContext);
-    }
-
-    /**
-     * Checks to see if the metadata for the entity supports the required NameID format.
-     * 
-     * @param filterContext current filter context
-     * 
-     * @return true if the entity supports the required NameID format, false otherwise
-     */
-    protected boolean isNameIDFormatSupported(ShibbolethFilteringContext filterContext) {
-        SSODescriptor role = getEntitySSODescriptor(filterContext);
-        if (role == null) {
-            log.debug("entity does contain an appropriate SSO role descriptor");
-            return false;
-        }
-
-        List<NameIDFormat> supportedFormats = role.getNameIDFormats();
-        if (supportedFormats == null || supportedFormats.isEmpty()) {
-            log.debug("entity SSO role descriptor does not list any supported NameID formats");
-            return false;
-        }
-
-        for (NameIDFormat supportedFormat : supportedFormats) {
-            if (nameIdFormat.equals(supportedFormat.getFormat())) {
-                log.debug("entity does support the NameID format '{}'", nameIdFormat);
-                return true;
-            }
-        }
-
-        log.debug("entity does not support the NameID format '{}'", nameIdFormat);
-        return false;
-    }
-
-    /**
-     * Gets the SSO role descriptor for the entity to be checked.
-     * 
-     * @param filterContext current filtering context
-     * 
-     * @return the SSO role descriptor of the entity or null if the entity does not have such a descriptor
-     */
-    protected abstract SSODescriptor getEntitySSODescriptor(ShibbolethFilteringContext filterContext);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeInMetadataMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeInMetadataMatchFunctor.java.svn-base
deleted file mode 100644
index 6e6ed5c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeInMetadataMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.joda.time.DateTime;
-import org.opensaml.common.SAMLObject;
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.AuthnRequest;
-import org.opensaml.saml2.metadata.AttributeConsumingService;
-import org.opensaml.saml2.metadata.RequestedAttribute;
-import org.opensaml.saml2.metadata.RoleDescriptor;
-import org.opensaml.saml2.metadata.SPSSODescriptor;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.schema.XSAny;
-import org.opensaml.xml.schema.XSBase64Binary;
-import org.opensaml.xml.schema.XSBoolean;
-import org.opensaml.xml.schema.XSDateTime;
-import org.opensaml.xml.schema.XSInteger;
-import org.opensaml.xml.schema.XSString;
-import org.opensaml.xml.schema.XSURI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML1AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML2AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AbstractMatchFunctor;
-
-/**
- * Match functor that checks whether an attribute is enumerated in an SP's metadata
- * as a required or optional attribute. Also supports simple string-based value
- * filtering.
- */
-public class AttributeInMetadataMatchFunctor extends AbstractMatchFunctor {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AttributeInMetadataMatchFunctor.class);
-
-    /** Whether optionally requested attributes should be matched. */
-    private boolean onlyIfRequired;
-    
-    /** Whether to return a match if the metadata does not contain an ACS descriptor. */
-    private boolean matchIfMetadataSilent;
-
-    /**
-     * Gets whether optionally requested attributes should be matched.
-     * 
-     * @return Whether optionally requested attributes should be matched.
-     */
-    public boolean isOnlyIfRequired() {
-        return onlyIfRequired;
-    }
-
-    /**
-     * Sets whether optionally requested attributes should be matched.
-     * 
-     * @param flag whether optionally requested attributes should be matched
-     */
-    public void setOnlyIfRequired(final boolean flag) {
-        onlyIfRequired = flag;
-    }
-
-    /**
-     * Gets whether to matched if the metadata contains no AttributeConsumingService.
-     * 
-     * @return whether to match if the metadata contains no AttributeConsumingService
-     */
-    public boolean isMatchIfMetadataSilent() {
-        return matchIfMetadataSilent;
-    }
-
-    /**
-     * Sets whether to match if the metadata contains no AttributeConsumingService.
-     * 
-     * @param flag whether to match if the metadata contains no AttributeConsumingService
-     */
-    public void setMatchIfMetadataSilent(final boolean flag) {
-        matchIfMetadataSilent = flag;
-    }
-    
-    /** {@inheritDoc} */
-    protected boolean doEvaluatePolicyRequirement(final ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        throw new FilterProcessingException("This match functor is not supported in policy requirements");
-    }
-
-    /** {@inheritDoc} */
-    protected boolean doEvaluateValue(final ShibbolethFilteringContext filterContext, final String attributeId,
-            final Object attributeValue) throws FilterProcessingException {
-
-        // TODO: this is a fair bit of work to do for every value, we might consider exposing
-        // the "active" AttributeConsumingService object on the attribute request context.
-        // I guess the intent was that filterContext.getAttributeRequestContext().getRequestedAttributesIds()
-        // would be used. We could do that, but it wouldn't support value filtering, and I don't know how
-        // easy it is for the request context code to get access to the the full set of attributes and
-        // encoders from the resolver prior to resolution.
-
-        // Check for SP role.
-        final RoleDescriptor role = filterContext.getAttributeRequestContext().getPeerEntityRoleMetadata();
-        if (!(role instanceof SPSSODescriptor)) {
-            log.debug("attribute requester's metadata role does not contain attribute requirements");
-            return false;
-        }
-
-        // If the request is an AuthnRequest, check for an AttributeConsumingServiceIndex.
-        AttributeConsumingService service = null;
-        final SAMLObject inbound = filterContext.getAttributeRequestContext().getInboundSAMLMessage();
-        if (inbound != null && inbound instanceof AuthnRequest) {
-            final Integer i = ((AuthnRequest) inbound).getAttributeConsumingServiceIndex();
-            if (i != null) {
-                final List<AttributeConsumingService> services =
-                        ((SPSSODescriptor) role).getAttributeConsumingServices();
-                for (final AttributeConsumingService s : services) {
-                    if (s.getIndex() == i) {
-                        service = s;
-                        break;
-                    }
-                }
-                if (service == null) {
-                    log.warn("Incoming AuthnRequest's AttributeConsumingServiceIndex did not match peer's metadata");
-                    return false;
-                }
-            }
-        }
-
-        if (service == null) {
-            service = ((SPSSODescriptor) role).getDefaultAttributeConsumingService();
-        }
-        if (service == null) {
-            log.debug("The peer's metadata did not contain an AttributeConsumingService descriptor");
-            return matchIfMetadataSilent;
-        }
-
-        log.debug("Using AttributeConsumingService descriptor with index {}", service.getIndex());
-
-        final BaseAttribute attr = filterContext.getUnfilteredAttributes().get(attributeId);
-        if (attr != null && attr.getValues() != null) {
-            final List<AttributeEncoder> encoders = attr.getEncoders();
-            final Iterator<AttributeEncoder> i = encoders.iterator();
-            while (i.hasNext()) {
-                final AttributeEncoder encoder = i.next();
-                final RequestedAttribute requested = findInMetadata(service, encoder);
-                if (requested != null) {
-                    if (onlyIfRequired && !requested.isRequired()) {
-                        log.debug("Attribute {} requested in metadata, but was not required", attributeId);
-                        return false;
-                    }
-                    log.debug("Found attribute {} requested in metadata", attributeId);
-                    final List<XMLObject> vals = requested.getAttributeValues();
-                    if (vals == null || vals.isEmpty()) {
-                        return true;
-                    }
-                    final String v = attributeValue.toString();
-                    for (final XMLObject xmlObj : vals) {
-                        if (match(xmlObj, v)) {
-                            return true;
-                        }
-                    }
-                    log.debug("Attribute {} found in metadata, but value not among those requested", attributeId);
-                    return false;
-                }
-            }
-            log.debug("Attribute {} not found in metadata", attributeId);
-        }
-
-        return false;
-    }
-
-    /**
-     * Locates a RequestedAttribute object in metadata that matches the eventual "to be encoded" name
-     * represented by the encoder.
-     * 
-     * @param service the metadata descriptor to search
-     * @param encoder the attribute encoder to base the search on
-     * @return a matching RequestedAttribute, or null
-     */
-    private RequestedAttribute findInMetadata(final AttributeConsumingService service,
-            final AttributeEncoder encoder) {
-        // I think it would be cleaner to expose a "protocol" property on the
-        // encoder interface to match up against the outbound protocol than to
-        // do a switch here based on casting/detecting the encoder type based
-        // on the protocol string and ending up with a maintenance issue, so
-        // for now, I'm just looking for any matching Attribute name.
-        // Still have to cast because of where the name qualifier is.
-        // We could add an abstracted qualifier accessor on the encoder base
-        // interface, and implement it via getNamespace / getNameFormat also.
-        final List<RequestedAttribute> requested = service.getRequestAttributes();
-        for (final RequestedAttribute attr : requested) {
-            if (attr.getName().equals(encoder.getAttributeName())) {
-                String qualifier = null;
-                if (encoder instanceof SAML2AttributeEncoder) {
-                    qualifier = ((SAML2AttributeEncoder) encoder).getNameFormat();
-                } else if (encoder instanceof SAML1AttributeEncoder) {
-                    qualifier = ((SAML1AttributeEncoder) encoder).getNamespace();
-                }
-                final String nameFormat = attr.getNameFormat();
-                if (qualifier == null || nameFormat == null || nameFormat.equals(Attribute.UNSPECIFIED)
-                        || qualifier.equals(nameFormat)) {
-                    return attr;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Checks whether an XMLObject's "value" matches a candidate value.
-     * 
-     * @param xmlObj the XMLObject to match
-     * @param attributeValue the candidate value to match against
-     * @return true iff the two parameters are non-null and match
-     */
-    private boolean match(final XMLObject xmlObj, final String attributeValue) {
-        // This is a substitute for a decoder layer that can generate
-        // internal comparable value objects out of AttributeValue elements.
-        // Short of that, some kind of pluggable comparison object with
-        // knowledge of the XML syntax and the internal attribute objects
-        // would be needed.
-        String toMatch = null;
-        if (xmlObj instanceof XSString) {
-            toMatch = ((XSString) xmlObj).getValue();
-        } else if (xmlObj instanceof XSURI) {
-            toMatch = ((XSURI) xmlObj).getValue();
-        } else if (xmlObj instanceof XSBoolean) {
-            toMatch = ((XSBoolean) xmlObj).getValue().getValue() ? "1" : "0";
-        } else if (xmlObj instanceof XSInteger) {
-            toMatch = ((XSInteger) xmlObj).getValue().toString();
-        } else if (xmlObj instanceof XSDateTime) {
-            final DateTime dt = ((XSDateTime) xmlObj).getValue();
-            if (dt != null) {
-                toMatch = ((XSDateTime) xmlObj).getDateTimeFormatter().print(dt);
-            }
-        } else if (xmlObj instanceof XSBase64Binary) {
-            toMatch = ((XSBase64Binary) xmlObj).getValue();
-        } else if (xmlObj instanceof XSAny) {
-            final XSAny wc = (XSAny) xmlObj;
-            if (wc.getUnknownAttributes().isEmpty() && wc.getUnknownXMLObjects().isEmpty()) {
-                toMatch = wc.getTextContent();
-            }
-        }
-        if (toMatch != null) {
-            return toMatch.equals(attributeValue);
-        }
-        log.warn("Unrecognized XMLObject type, unable to match as a string to candidate value");
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctor.java.svn-base
deleted file mode 100644
index 1e7dea0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.saml2.metadata.EntityDescriptor;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Match functor that checks, via an exact match, if the attribute issuer contains an entity attribute with a given
- * value.
- */
-public class AttributeIssuerEntityAttributeExactMatchFunctor extends AbstractEntityAttributeExactMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected EntityDescriptor getEntityMetadata(ShibbolethFilteringContext filterContext) {
-        return filterContext.getAttributeRequestContext().getLocalEntityMetadata();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 5551985..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.saml2.metadata.EntityDescriptor;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Match functor that checks, via matching against a regular expression, if the attribute issuer contains an entity
- * attribute with a given value.
- */
-public class AttributeIssuerEntityAttributeRegexMatchFunctor extends AbstractEntityAttributeRegexMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected EntityDescriptor getEntityMetadata(ShibbolethFilteringContext filterContext) {
-        return filterContext.getAttributeRequestContext().getLocalEntityMetadata();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctor.java.svn-base
deleted file mode 100644
index b1256f1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if attribute issuer matches the provided entity group name.
- */
-public class AttributeIssuerInEntityGroupMatchFunctor extends AbstractEntityGroupMatchFunctor {
-
-    /** {@inheritDoc} */
-    public boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isEntityInGroup(filterContext.getAttributeRequestContext().getLocalEntityMetadata());
-    }
-
-    /** {@inheritDoc} */
-    public boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isEntityInGroup(filterContext.getAttributeRequestContext().getLocalEntityMetadata());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctor.java.svn-base
deleted file mode 100644
index b4a614d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.saml2.metadata.RoleDescriptor;
-import org.opensaml.saml2.metadata.SSODescriptor;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/** Checks if the attribute requester supports the required NameID format. */
-public class AttributeIssuerNameIDFormatExactMatchFunctor extends AbstractNameIDFormatSupportedMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected SSODescriptor getEntitySSODescriptor(ShibbolethFilteringContext filterContext) {
-        RoleDescriptor role = filterContext.getAttributeRequestContext().getLocalEntityRoleMetadata();
-        if (role instanceof SSODescriptor) {
-            return (SSODescriptor) role;
-        }
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctor.java.svn-base
deleted file mode 100644
index 4a6d316..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.saml2.metadata.EntityDescriptor;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Match functor that checks, via an exact match, if the attribute requester contains an entity attribute with a given
- * value.
- */
-public class AttributeRequesterEntityAttributeExactMatchFunctor extends AbstractEntityAttributeExactMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected EntityDescriptor getEntityMetadata(ShibbolethFilteringContext filterContext) {
-        return filterContext.getAttributeRequestContext().getPeerEntityMetadata();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctor.java.svn-base
deleted file mode 100644
index 5a40a88..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.saml2.metadata.EntityDescriptor;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * Match functor that checks, via matching against a regular expression, if the attribute requester contains an entity
- * attribute with a given value.
- */
-public class AttributeRequesterEntityAttributeRegexMatchFunctor extends AbstractEntityAttributeRegexMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected EntityDescriptor getEntityMetadata(ShibbolethFilteringContext filterContext) {
-        return filterContext.getAttributeRequestContext().getPeerEntityMetadata();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctor.java.svn-base
deleted file mode 100644
index fc11b20..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/**
- * A match function that evaluates to true if attribute requester matches the provided entity group name.
- */
-public class AttributeRequesterInEntityGroupMatchFunctor extends AbstractEntityGroupMatchFunctor {
-
-    /** {@inheritDoc} */
-    public boolean doEvaluatePolicyRequirement(ShibbolethFilteringContext filterContext)
-            throws FilterProcessingException {
-        return isEntityInGroup(filterContext.getAttributeRequestContext().getPeerEntityMetadata());
-    }
-
-    /** {@inheritDoc} */
-    public boolean doEvaluateValue(ShibbolethFilteringContext filterContext, String attributeId,
-            Object attributeValue) throws FilterProcessingException {
-        return isEntityInGroup(filterContext.getAttributeRequestContext().getPeerEntityMetadata());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctor.java.svn-base
deleted file mode 100644
index c01b30e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctor.java.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import org.opensaml.saml2.metadata.RoleDescriptor;
-import org.opensaml.saml2.metadata.SSODescriptor;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-
-/** Checks if the attribute issuer supports the required NameID format. */
-public class AttributeRequesterNameIDFormatExactMatchFunctor extends AbstractNameIDFormatSupportedMatchFunctor {
-
-    /** {@inheritDoc} */
-    protected SSODescriptor getEntitySSODescriptor(ShibbolethFilteringContext filterContext) {
-        RoleDescriptor role = filterContext.getAttributeRequestContext().getPeerEntityRoleMetadata();
-        if (role instanceof SSODescriptor) {
-            return (SSODescriptor) role;
-        }
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/all-wcprops
deleted file mode 100644
index 30f65e2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 122
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider
-END
-BasicAttribute.java
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java
-END
-SAML1AttributeAuthority.java
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/1036/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/SAML1AttributeAuthority.java
-END
-SAML2AttributeAuthority.java
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/1036/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/SAML2AttributeAuthority.java
-END
-ScopedAttributeValue.java
-K 25
-svn:wc:ra_dav:version-url
-V 147
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/ScopedAttributeValue.java
-END
-ShibbolethSAML1AttributeAuthority.java
-K 25
-svn:wc:ra_dav:version-url
-V 161
-/java-shib-common/!svn/ver/1039/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/ShibbolethSAML1AttributeAuthority.java
-END
-ShibbolethSAML2AttributeAuthority.java
-K 25
-svn:wc:ra_dav:version-url
-V 161
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/ShibbolethSAML2AttributeAuthority.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/entries
deleted file mode 100644
index 3a36f4f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/entries
+++ /dev/null
@@ -1,232 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ScopedAttributeValue.java
-file
-
-
-
-
-2014-02-19T17:27:42.486773Z
-320823e9a4dc9406d02cef08f59d9c67
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2743
-

-ShibbolethSAML1AttributeAuthority.java
-file
-
-
-
-
-2014-02-19T17:27:42.486773Z
-445790456ffe7abf86b65524fea23a56
-2012-11-07T20:19:31.933500Z
-1039
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12902
-

-ShibbolethSAML2AttributeAuthority.java
-file
-
-
-
-
-2014-02-19T17:27:42.486773Z
-b40a3a9b1a1be7bbd89e16c234e59437
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14787
-

-BasicAttribute.java
-file
-
-
-
-
-2014-02-19T17:27:42.486773Z
-f715eea2aaccc505a19753d1b469f3d2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3984
-

-SAML1AttributeAuthority.java
-file
-
-
-
-
-2014-02-19T17:27:42.486773Z
-23e120db089049f15acf78e26823a985
-2012-11-06T00:57:11.533030Z
-1036
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4171
-

-SAML2AttributeAuthority.java
-file
-
-
-
-
-2014-02-19T17:27:42.486773Z
-58d5ac0e1503bbfaf2ae8c3c5c83124a
-2012-11-06T00:57:11.533030Z
-1036
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4120
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/BasicAttribute.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/BasicAttribute.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/BasicAttribute.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/SAML1AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/SAML1AttributeAuthority.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/SAML1AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/SAML2AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/SAML2AttributeAuthority.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/SAML2AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ScopedAttributeValue.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ScopedAttributeValue.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ScopedAttributeValue.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ShibbolethSAML1AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ShibbolethSAML1AttributeAuthority.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ShibbolethSAML1AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ShibbolethSAML2AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ShibbolethSAML2AttributeAuthority.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/prop-base/ShibbolethSAML2AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/BasicAttribute.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/BasicAttribute.java.svn-base
deleted file mode 100644
index 1ee21d5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/BasicAttribute.java.svn-base
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-
-/**
- * An attribute implementation that operates on simple value types.
- * 
- * <strong>NOTE:</strong> many plugins will use the {@link Object#toString()} method on an attribute's 
- * values.  Therefore any value should return something reasonable for that method and what is returned 
- * should be very stable across versions.
- * 
- * @param <ValueType> value type
- */
-public class BasicAttribute<ValueType> extends BaseAttribute<ValueType> implements Cloneable {
-
-    /** ID of this attribute. */
-    private String id;
-
-    /** Map of attribute encoders for this attribute, keyed off of category. */
-    private ArrayList<AttributeEncoder> encoders;
-
-    /** Set of values for this attribute. */
-    private Collection<ValueType> values;
-
-    /** Comparator for this attribute. */
-    private Comparator<ValueType> comparator;
-
-    /** Constructor. */
-    public BasicAttribute() {
-        encoders = new ArrayList<AttributeEncoder>(3);
-        values = new ArrayList<ValueType>(5);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param attributeId the ID of this attribute
-     */
-    public BasicAttribute(String attributeId) {
-        id = DatatypeHelper.safeTrimOrNullString(attributeId);
-        encoders = new ArrayList<AttributeEncoder>();
-        values = new ArrayList<ValueType>(5);
-    }
-
-    /** {@inheritDoc} */
-    public List<AttributeEncoder> getEncoders() {
-        return encoders;
-    }
-
-    /** {@inheritDoc} */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Set id of this attribute.
-     * 
-     * @param newID new ID
-     */
-    public void setId(String newID) {
-        id = newID;
-    }
-
-    /** {@inheritDoc} */
-    public Comparator<ValueType> getValueComparator() {
-        return comparator;
-    }
-
-    /**
-     * Set value comparator for this attribute.
-     * 
-     * @param newComparator new value comparator
-     */
-    public void setValueComparator(Comparator<ValueType> newComparator) {
-        comparator = newComparator;
-    }
-
-    /** {@inheritDoc} */
-    public Collection<ValueType> getValues() {
-        return values;
-    }
-
-    /**
-     * Replace the current set of values with the given set.
-     * 
-     * @param newValues new values to replace existing ones
-     */
-    public void setValues(Collection<ValueType> newValues) {
-        values = newValues;
-    }
-
-    /** {@inheritDoc} */
-    public BasicAttribute<ValueType> clone() {
-        BasicAttribute<ValueType> newAttribute = new BasicAttribute<ValueType>();
-
-        newAttribute.setId(getId());
-
-        newAttribute.setValueComparator(this.getValueComparator());
-
-        newAttribute.getValues().addAll(getValues());
-
-        newAttribute.getEncoders().addAll(getEncoders());
-
-        return newAttribute;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/SAML1AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/SAML1AttributeAuthority.java.svn-base
deleted file mode 100644
index 07ed07a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/SAML1AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.provider;
-
-import java.util.Collection;
-
-import org.opensaml.common.SAMLObject;
-import org.opensaml.saml1.core.AttributeDesignator;
-import org.opensaml.saml1.core.AttributeQuery;
-import org.opensaml.saml1.core.AttributeStatement;
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.saml1.core.ResponseAbstractType;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestException;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.AbstractSAML1ProfileConfiguration;
-
-/**
- * An attribute authority that can take an attribute query and produce a resultant attribute statement.
- */
-public interface SAML1AttributeAuthority
-        extends
-        AttributeAuthority<SAMLProfileRequestContext<? extends SAMLObject, ? extends ResponseAbstractType, NameIdentifier, ? extends AbstractSAML1ProfileConfiguration>> {
-
-    /**
-     * Resolves a {@link NameIdentifier} into the internal principal name used by Shibboleth.
-     * 
-     * @param requestContext The request context within which to retrieve the principal. At a minimum, a
-     *            {@link NameIdentifier} and relying party ID must be included.
-     * 
-     * @return {@link NameIdentifier} into the internal principal name used by Shibboleth
-     * 
-     * @throws AttributeRequestException thrown if the principal get not be resolved
-     */
-    public String getPrincipal(
-            SAMLProfileRequestContext<? extends SAMLObject, ? extends ResponseAbstractType, NameIdentifier, ? extends AbstractSAML1ProfileConfiguration> requestContext)
-            throws AttributeRequestException;
-
-    /**
-     * Creates a SAML 1 attribute statement from a collection of {@link BaseAttribute}.
-     * 
-     * @param query the attribute query the statement is in response to, may be null
-     * @param attributes the attributes to create the attribute statement form
-     * 
-     * @return the generated attribute statement
-     * 
-     * @throws AttributeEncodingException thrown if an {@link BaseAttribute} can not be encoded
-     */
-    public AttributeStatement buildAttributeStatement(AttributeQuery query, Collection<BaseAttribute> attributes)
-            throws AttributeEncodingException;
-
-    /**
-     * Translates SAML 1 attribute naming information into the internal attribute ID used by the resolver and filtering
-     * engine.
-     * 
-     * @param attribute the SAML 1 attribute to translate
-     * 
-     * @return the attribute ID used by the resolver and filtering engine
-     */
-    public String getAttributeIDBySAMLAttribute(AttributeDesignator attribute);
-
-    /**
-     * Translates the internal attribute ID, used by the resolver and filtering engine, into its representative SAML 1
-     * attribute name.
-     * 
-     * @param id internal attribute ID
-     * 
-     * @return SAML 1 attribute name
-     */
-    public AttributeDesignator getSAMLAttributeByAttributeID(String id);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/SAML2AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/SAML2AttributeAuthority.java.svn-base
deleted file mode 100644
index df5bbe4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/SAML2AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.provider;
-
-import java.util.Collection;
-
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.AttributeQuery;
-import org.opensaml.saml2.core.AttributeStatement;
-import org.opensaml.saml2.core.NameID;
-import org.opensaml.saml2.core.RequestAbstractType;
-import org.opensaml.saml2.core.StatusResponseType;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestException;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.AbstractSAML2ProfileConfiguration;
-
-/**
- * An attribute authority that can take an attribute query and produce a resultant attribute statement.
- */
-public interface SAML2AttributeAuthority
-        extends
-        AttributeAuthority<SAMLProfileRequestContext<? extends RequestAbstractType, ? extends StatusResponseType, NameID, ? extends AbstractSAML2ProfileConfiguration>> {
-
-    /**
-     * Resolves a {@link NameID} into the internal principal name used by Shibboleth.
-     * 
-     * @param requestContext The request context within which to retrieve the principal. At a minimum, a {@link NameID}
-     *            and relying party ID must be included.
-     * 
-     * @return {@link NameID} into the internal principal name used by Shibboleth
-     * 
-     * @throws AttributeRequestException thrown if the principal could not be resolved
-     */
-    public String getPrincipal(
-            SAMLProfileRequestContext<? extends RequestAbstractType, ? extends StatusResponseType, NameID, ? extends AbstractSAML2ProfileConfiguration> requestContext)
-            throws AttributeRequestException;
-
-    /**
-     * Creates a SAML 2 attribute statement from a collection of {@link BaseAttribute}.
-     * 
-     * @param query the attribute query the statement is in response to, may be null
-     * @param attributes the attributes to create the attribute statement form
-     * 
-     * @return the generated attribute statement
-     * 
-     * @throws AttributeEncodingException thrown if an {@link BaseAttribute} can not be encoded
-     */
-    public AttributeStatement buildAttributeStatement(AttributeQuery query, Collection<BaseAttribute> attributes)
-            throws AttributeEncodingException;
-
-    /**
-     * Translates SAML 2 attribute naming information into the internal attribute ID used by the resolver and filtering
-     * engine.
-     * 
-     * @param attribute the SAML 2 attribute to translate
-     * 
-     * @return the attribute ID used by the resolver and filtering engine
-     */
-    public String getAttributeIDBySAMLAttribute(Attribute attribute);
-
-    /**
-     * Translates the internal attribute ID, used by the resolver and filtering engine, into its representative SAML 2
-     * attribute name.
-     * 
-     * @param id internal attribute ID
-     * 
-     * @return SAML 2 attribute name
-     */
-    public Attribute getSAMLAttributeByAttributeID(String id);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ScopedAttributeValue.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ScopedAttributeValue.java.svn-base
deleted file mode 100644
index 7ae79e3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ScopedAttributeValue.java.svn-base
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.provider;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * An attribute value with an associated scope.
- */
-public class ScopedAttributeValue {
-
-    /** Value of the attribute. */
-    private String value;
-
-    /** Scope of the attribute value. */
-    private String scope;
-
-    /**
-     * Constructor.
-     * 
-     * @param attributeValue value of the attribute
-     * @param valueScope scope of the value
-     */
-    public ScopedAttributeValue(String attributeValue, String valueScope) {
-        value = DatatypeHelper.safeTrimOrNullString(attributeValue);
-        scope = DatatypeHelper.safeTrimOrNullString(valueScope);
-
-        if (scope == null || value == null) {
-            throw new IllegalArgumentException("Attribute value and scope may not be null");
-        }
-    }
-
-    /**
-     * Gets the value of the attribute.
-     * 
-     * @return value of the attribute
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Gets the scope of the value.
-     * 
-     * @return scope of the value
-     */
-    public String getScope() {
-        return scope;
-    }
-
-    /** {@inheritDoc} */
-    public String toString() {
-        return value;
-    }
-
-    /** {@inheritDoc} */
-    public int hashCode() {
-        int hash = 1;
-        hash = hash * 31 + value.hashCode();
-        hash = hash * 31 + scope.hashCode();
-
-        return hash;
-    }
-
-    /** {@inheritDoc} */
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-
-        if (!(obj instanceof ScopedAttributeValue)) {
-            return false;
-        }
-
-        ScopedAttributeValue otherValue = (ScopedAttributeValue) obj;
-
-        return DatatypeHelper.safeEquals(getValue(), otherValue.getValue())
-                && DatatypeHelper.safeEquals(getScope(), otherValue.getScope());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ShibbolethSAML1AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ShibbolethSAML1AttributeAuthority.java.svn-base
deleted file mode 100644
index 529e479..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ShibbolethSAML1AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObject;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml1.core.Attribute;
-import org.opensaml.saml1.core.AttributeDesignator;
-import org.opensaml.saml1.core.AttributeQuery;
-import org.opensaml.saml1.core.AttributeStatement;
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.saml1.core.ResponseAbstractType;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.xml.XMLObjectBuilderFactory;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestException;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML1AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethAttributeFilteringEngine;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver;
-import edu.internet2.middleware.shibboleth.common.config.BaseService;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.AbstractSAML1ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/**
- * SAML 1 Attribute Authority.
- */
-public class ShibbolethSAML1AttributeAuthority extends BaseService implements SAML1AttributeAuthority {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethSAML1AttributeAuthority.class);
-
-    /** For building attribute statements. */
-    private SAMLObjectBuilder<AttributeStatement> statementBuilder;
-
-    /** Attribute resolver. */
-    private ShibbolethAttributeResolver attributeResolver;
-
-    /** To determine releasable attributes. */
-    private ShibbolethAttributeFilteringEngine filteringEngine;
-
-    /**
-     * This creates a new attribute authority.
-     * 
-     * @param resolver The attribute resolver to set
-     */
-    @SuppressWarnings("unchecked")
-    public ShibbolethSAML1AttributeAuthority(ShibbolethAttributeResolver resolver) {
-
-        XMLObjectBuilderFactory builderFactory = Configuration.getBuilderFactory();
-        statementBuilder = (SAMLObjectBuilder<AttributeStatement>) builderFactory
-                .getBuilder(AttributeStatement.DEFAULT_ELEMENT_NAME);
-
-        attributeResolver = resolver;
-    }
-
-    /**
-     * Gets the attribute resolver.
-     * 
-     * @return Returns the attributeResolver.
-     */
-    public ShibbolethAttributeResolver getAttributeResolver() {
-        return attributeResolver;
-    }
-
-    /**
-     * Gets the filtering engine.
-     * 
-     * @return Returns the filteringEngine.
-     */
-    public ShibbolethAttributeFilteringEngine getFilteringEngine() {
-        return filteringEngine;
-    }
-
-    /**
-     * Sets the attribute filtering engine.
-     * 
-     * @param engine attribute filtering engine
-     */
-    public void setFilteringEngine(ShibbolethAttributeFilteringEngine engine) {
-        filteringEngine = engine;
-    }
-
-    /** {@inheritDoc} */
-    public AttributeStatement buildAttributeStatement(AttributeQuery query, Collection<BaseAttribute> attributes)
-            throws AttributeEncodingException {
-
-        Collection<Attribute> encodedAttributes = encodeAttributes(query, attributes);
-        if (encodedAttributes != null && !encodedAttributes.isEmpty()) {
-            AttributeStatement statement = statementBuilder.buildObject();
-            statement.getAttributes().addAll(encodedAttributes);
-            return statement;
-        } else {
-            log.debug("No attributes were encoded, no attribute statement created.");
-            return null;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getAttributeIDBySAMLAttribute(AttributeDesignator attribute) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public String getPrincipal(
-            SAMLProfileRequestContext<? extends SAMLObject, ? extends ResponseAbstractType, NameIdentifier, ? extends AbstractSAML1ProfileConfiguration> requestContext)
-            throws AttributeRequestException {
-        if (requestContext.getInboundMessageIssuer() == null || requestContext.getSubjectNameIdentifier() == null) {
-            throw new AttributeRequestException(
-                    "Unable to resolve principal, attribute requester ID and subject name identifier may not be null");
-        }
-        return attributeResolver.resolvePrincipalName(requestContext);
-    }
-
-    /** {@inheritDoc} */
-    public AttributeDesignator getSAMLAttributeByAttributeID(String id) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> getAttributes(
-            SAMLProfileRequestContext<? extends SAMLObject, ? extends ResponseAbstractType, NameIdentifier, ? extends AbstractSAML1ProfileConfiguration> requestContext)
-            throws AttributeRequestException {
-        HashSet<String> requestedAttributes = new HashSet<String>();
-
-        // get attributes from the message
-        Set<String> queryAttributeIds = getAttributeIds(requestContext.getInboundSAMLMessage());
-        requestedAttributes.addAll(queryAttributeIds);
-
-        // get attributes from metadata
-        Set<String> metadataAttributeIds = getAttribtueIds(requestContext.getPeerEntityMetadata());
-        requestedAttributes.addAll(metadataAttributeIds);
-
-        requestContext.setRequestedAttributes(requestedAttributes);
-
-        Map<String, BaseAttribute> attributes = attributeResolver.resolveAttributes(requestContext);
-
-        if (filteringEngine != null) {
-            attributes = filteringEngine.filterAttributes(attributes, requestContext);
-        }
-
-        return attributes;
-    }
-
-    /**
-     * Gets the attribute IDs for those attributes requested in the attribute query.
-     * 
-     * @param samlRequest the attribute query
-     * 
-     * @return attribute IDs for those attributes requested in the attribute query
-     */
-    protected Set<String> getAttributeIds(SAMLObject samlRequest) {
-        Set<String> queryAttributeIds = new HashSet<String>();
-        if (!(samlRequest instanceof AttributeQuery)) {
-            return queryAttributeIds;
-        }
-
-        AttributeQuery query = (AttributeQuery) samlRequest;
-        if (query != null) {
-            List<AttributeDesignator> queryAttributes = query.getAttributeDesignators();
-            queryAttributeIds = getAttributeIds(queryAttributes);
-            log.debug("query message contains the following attributes: {}", queryAttributeIds);
-        }
-
-        return queryAttributeIds;
-    }
-
-    /**
-     * Gets the attribute IDs for those attributes requested in the entity metadata.
-     * 
-     * @param metadata the entity metadata
-     * 
-     * @return attribute IDs for those attributes requested in the entity metadata
-     */
-    protected Set<String> getAttribtueIds(EntityDescriptor metadata) {
-        Set<String> metadataAttributeIds = new HashSet<String>();
-        // TODO
-        return metadataAttributeIds;
-    }
-
-    /**
-     * This parses the attribute ids from the supplied list of attributes.
-     * 
-     * @param attributes <code>List</code>
-     * @return <code>Set</code> of attribute ids
-     */
-    protected Set<String> getAttributeIds(List<AttributeDesignator> attributes) {
-        final Set<String> attributeIds = new HashSet<String>();
-        for (AttributeDesignator a : attributes) {
-            String attrId = getAttributeIDBySAMLAttribute(a);
-            attributeIds.add(attrId);
-        }
-        return attributeIds;
-    }
-
-    /**
-     * This encodes the supplied attributes with that attribute's SAML1 encoder.
-     * 
-     * @param query request that may containing filtering designators
-     * @param attributes internal attributes to be encoded into SAML attributes
-     * 
-     * @return collection of encoded SAML attributes
-     */
-    @SuppressWarnings("unchecked")
-    protected Collection<Attribute> encodeAttributes(AttributeQuery query, Collection<BaseAttribute> attributes) {
-        Collection<Attribute> encodedAttributes = new ArrayList<Attribute>();
-
-        List<AttributeDesignator> designators = null;
-        if (query != null) {
-            designators = query.getAttributeDesignators();
-            if (designators != null && designators.isEmpty()) {
-                designators = null;
-            }
-        }
-        
-        for (BaseAttribute<?> shibbolethAttribute : attributes) {
-            if (shibbolethAttribute.getValues() == null || shibbolethAttribute.getValues().size() == 0) {
-                continue;
-            }
-            
-            boolean attributeEncoded = false;
-            
-            // first try to encode with a SAML 1 attribute encoder
-            Attribute attribute;
-            for (AttributeEncoder encoder : shibbolethAttribute.getEncoders()) {
-                if (encoder instanceof SAML1AttributeEncoder) {
-                    
-                    // see if the encoded result is filtered out by the query
-                    boolean worthEncoding = true;
-                    if (designators != null) {
-                        worthEncoding = false;
-                        for (AttributeDesignator designator : designators) {
-                            if (DatatypeHelper.safeEquals(designator.getAttributeName(), encoder.getAttributeName()) &&
-                                    DatatypeHelper.safeEquals(designator.getAttributeNamespace(),
-                                            ((SAML1AttributeEncoder) encoder).getNamespace())) {
-                                worthEncoding = true;
-                                break;
-                            }
-                        }
-                    }
-                    
-                    if (worthEncoding) {
-                        try {
-                            attribute = (Attribute) encoder.encode(shibbolethAttribute);
-                            if (attribute != null) {
-                                attributeEncoded = true;
-                                encodedAttributes.add(attribute);
-                                if (log.isDebugEnabled()) {
-                                    log.debug("Encoded attribute {} with encoder of type {}", shibbolethAttribute.getId(),
-                                            encoder.getClass().getName());
-                                }
-                            }
-                        } catch (AttributeEncodingException e) {
-                            log.warn("Unable to encode attribute: {}", shibbolethAttribute.getId(), e);
-                        }
-                    } else {
-                        log.debug("Skipped encoding of attribute {} because the resulting name was excluded by the query.",
-                                shibbolethAttribute.getId());
-                    }
-                }
-            }
-
-            // if it couldn't be encoded log it
-            if (!attributeEncoded) {
-                log.debug("Attribute {} was not encoded (filtered by query, or no SAML1AttributeEncoder attached).",
-                        shibbolethAttribute.getId());
-            }            
-        }
-
-        return encodedAttributes;
-    }
-
-    /** {@inheritDoc} */
-    protected void onNewContextCreated(ApplicationContext newServiceContext) throws ServiceException {
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ShibbolethSAML2AttributeAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ShibbolethSAML2AttributeAuthority.java.svn-base
deleted file mode 100644
index 779976e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/.svn/text-base/ShibbolethSAML2AttributeAuthority.java.svn-base
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.common.xml.SAMLConstants;
-import org.opensaml.saml2.core.Attribute;
-import org.opensaml.saml2.core.AttributeQuery;
-import org.opensaml.saml2.core.AttributeStatement;
-import org.opensaml.saml2.core.NameID;
-import org.opensaml.saml2.core.RequestAbstractType;
-import org.opensaml.saml2.core.StatusResponseType;
-import org.opensaml.saml2.metadata.AttributeAuthorityDescriptor;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.xml.XMLObjectBuilderFactory;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestException;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncodingException;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.SAML2AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethAttributeFilteringEngine;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver;
-import edu.internet2.middleware.shibboleth.common.config.BaseService;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.AbstractSAML2ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/**
- * SAML 2.0 Attribute Authority.
- */
-public class ShibbolethSAML2AttributeAuthority extends BaseService implements SAML2AttributeAuthority {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethSAML2AttributeAuthority.class);
-
-    /** For building attribute statements. */
-    private SAMLObjectBuilder<AttributeStatement> statementBuilder;
-
-    /** Attribute resolver. */
-    private ShibbolethAttributeResolver attributeResolver;
-
-    /** To determine releasable attributes. */
-    private ShibbolethAttributeFilteringEngine filteringEngine;
-
-    /**
-     * This creates a new attribute authority.
-     * 
-     * @param resolver The attribute resolver to set
-     */
-    @SuppressWarnings("unchecked")
-    public ShibbolethSAML2AttributeAuthority(ShibbolethAttributeResolver resolver) {
-
-        XMLObjectBuilderFactory builderFactory = Configuration.getBuilderFactory();
-        statementBuilder = (SAMLObjectBuilder<AttributeStatement>) builderFactory
-                .getBuilder(AttributeStatement.DEFAULT_ELEMENT_NAME);
-
-        attributeResolver = resolver;
-    }
-
-    /**
-     * Gets the attribute resolver.
-     * 
-     * @return Returns the attributeResolver.
-     */
-    public ShibbolethAttributeResolver getAttributeResolver() {
-        return attributeResolver;
-    }
-
-    /**
-     * Gets the filtering engine.
-     * 
-     * @return Returns the filteringEngine.
-     */
-    public ShibbolethAttributeFilteringEngine getFilteringEngine() {
-        return filteringEngine;
-    }
-
-    /**
-     * Sets the attribute filtering engine.
-     * 
-     * @param engine attribute filtering engine
-     */
-    public void setFilteringEngine(ShibbolethAttributeFilteringEngine engine) {
-        filteringEngine = engine;
-    }
-
-    /** {@inheritDoc} */
-    public AttributeStatement buildAttributeStatement(AttributeQuery query, Collection<BaseAttribute> attributes)
-            throws AttributeEncodingException {
-
-        Collection<Attribute> encodedAttributes = encodeAttributes(query, attributes);
-
-        filterAttributesByValue(query, encodedAttributes);
-
-        if (!encodedAttributes.isEmpty()) {
-            AttributeStatement statement = statementBuilder.buildObject();
-            List<org.opensaml.saml2.core.Attribute> samlAttributes = statement.getAttributes();
-            samlAttributes.addAll(encodedAttributes);
-            return statement;
-        } else {
-            log.debug("No attributes remained after encoding and filtering by value, no attribute statement built");
-            return null;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getAttributeIDBySAMLAttribute(Attribute attribute) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public Attribute getSAMLAttributeByAttributeID(String id) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public String getPrincipal(
-            SAMLProfileRequestContext<? extends RequestAbstractType, ? extends StatusResponseType, NameID, ? extends AbstractSAML2ProfileConfiguration> requestContext)
-            throws AttributeRequestException {
-        if (requestContext.getInboundMessageIssuer() == null || requestContext.getSubjectNameIdentifier() == null) {
-            throw new AttributeRequestException(
-                    "Unable to resolve principal, attribute request ID and subject name identifier may not be null");
-        }
-
-        return attributeResolver.resolvePrincipalName(requestContext);
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> getAttributes(
-            SAMLProfileRequestContext<? extends RequestAbstractType, ? extends StatusResponseType, NameID, ? extends AbstractSAML2ProfileConfiguration> requestContext)
-            throws AttributeRequestException {
-        HashSet<String> requestedAttributes = new HashSet<String>();
-
-        // get attributes from the message
-        Set<String> queryAttributeIds = getAttributeIds(requestContext.getInboundSAMLMessage());
-        requestedAttributes.addAll(queryAttributeIds);
-
-        // get attributes from metadata
-        Set<String> metadataAttributeIds = getAttribtueIds(requestContext.getPeerEntityMetadata());
-        requestedAttributes.addAll(metadataAttributeIds);
-
-        requestContext.setRequestedAttributes(requestedAttributes);
-
-        // Resolve attributes
-        Map<String, BaseAttribute> attributes = attributeResolver.resolveAttributes(requestContext);
-
-        // Filter resulting attributes
-        if (filteringEngine != null) {
-            attributes = filteringEngine.filterAttributes(attributes, requestContext);
-        }
-
-        return attributes;
-    }
-
-    /**
-     * This encodes the supplied attributes with that attribute's SAML2 encoder.
-     * 
-     * @param query request that may containing filtering designators
-     * @param attributes the attributes to encode
-     * 
-     * @return the encoded attributes
-     * 
-     * @throws AttributeEncodingException thrown if an attribute could not be encoded
-     */
-    @SuppressWarnings("unchecked")
-    protected Collection<Attribute> encodeAttributes(AttributeQuery query, Collection<BaseAttribute> attributes)
-            throws AttributeEncodingException {
-        Collection<Attribute> encodedAttributes = new ArrayList<Attribute>();
-
-        List<Attribute> designators = null;
-        if (query != null) {
-            designators = query.getAttributes();
-            if (designators != null && designators.isEmpty()) {
-                designators = null;
-            }
-        }
-        
-        for (BaseAttribute<?> shibbolethAttribute : attributes) {
-            if (shibbolethAttribute.getValues() == null || shibbolethAttribute.getValues().size() == 0) {
-                continue;
-            }
-
-            boolean attributeEncoded = false;
-
-            Attribute attribute;
-            for (AttributeEncoder encoder : shibbolethAttribute.getEncoders()) {
-                if (encoder instanceof SAML2AttributeEncoder) {
-
-                    // see if the encoded result is filtered out by the query
-                    boolean worthEncoding = true;
-                    if (designators != null) {
-                        worthEncoding = false;
-                        for (Attribute designator : designators) {
-                            if (DatatypeHelper.safeEquals(designator.getName(), encoder.getAttributeName())) {
-                                String nf1 = designator.getNameFormat();
-                                String nf2 = ((SAML2AttributeEncoder) encoder).getNameFormat();
-                                if (nf1 != null && nf1.equals(Attribute.UNSPECIFIED)) {
-                                    nf1 = null;
-                                }
-                                if (nf2 != null && nf2.equals(Attribute.UNSPECIFIED)) {
-                                    nf2 = null;
-                                }
-                                if (DatatypeHelper.safeEquals(nf1, nf2)) {
-                                    worthEncoding = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    
-                    if (worthEncoding) {
-                        try {
-                            attribute = (Attribute) encoder.encode(shibbolethAttribute);
-                            if (attribute != null) {
-                                encodedAttributes.add(attribute);
-                                attributeEncoded = true;
-                                log.debug("Encoded attribute {} with encoder of type {}", shibbolethAttribute.getId(),
-                                        encoder.getClass().getName());
-                            }
-                        } catch (AttributeEncodingException e) {
-                            log.warn("unable to encode attribute: " + shibbolethAttribute.getId(), e);
-                        }
-                    }
-                    else {
-                        log.debug("Skipped encoding of attribute {} because the resulting name was excluded by the query",
-                                shibbolethAttribute.getId());
-                    }
-                }
-            }
-
-            // if it couldn't be encoded log it
-            if (!attributeEncoded) {
-                log.debug("Attribute {} was not encoded (filtered by query, or no SAML2AttributeEncoder attached).",
-                        shibbolethAttribute.getId());
-            }
-        }
-
-        return encodedAttributes;
-    }
-
-    /**
-     * Filters out all but the values, for an attribute, provided in the query, if and only if, the query specifies at
-     * least one value for the attribute. That is to say, if the attribute query does not specify any attribute values
-     * then all values for that attribute are accepted and remain. Because this comparison acts on the marshalled form
-     * the provided attributes will be encoded prior to filtering.
-     * 
-     * @param query the attribute query
-     * @param attributes the attributes to filter
-     */
-    protected void filterAttributesByValue(AttributeQuery query, Collection<Attribute> attributes) {
-        if (query == null) {
-            return;
-        }
-
-        // TODO not implemented yet
-    }
-
-    /**
-     * Gets the attribute IDs for those attributes requested in the attribute query.
-     * 
-     * @param samlRequest incomming SAML request
-     * 
-     * @return attribute IDs for those attributes requested in the attribute query
-     */
-    protected Set<String> getAttributeIds(RequestAbstractType samlRequest) {
-        Set<String> queryAttributeIds = new HashSet<String>();
-        if (!(samlRequest instanceof AttributeQuery)) {
-            return queryAttributeIds;
-        }
-
-        AttributeQuery query = (AttributeQuery) samlRequest;
-        if (query != null) {
-            List<org.opensaml.saml2.core.Attribute> queryAttributes = query.getAttributes();
-            queryAttributeIds = getAttributeIds(queryAttributes);
-            log.debug("query message contains the following attributes: {}", queryAttributeIds);
-        }
-
-        return queryAttributeIds;
-    }
-
-    /**
-     * Gets the attribute IDs for those attributes requested in the entity metadata.
-     * 
-     * @param metadata the entity metadata
-     * 
-     * @return attribute IDs for those attributes requested in the entity metadata
-     */
-    protected Set<String> getAttribtueIds(EntityDescriptor metadata) {
-        Set<String> metadataAttributeIds = new HashSet<String>();
-        AttributeAuthorityDescriptor aaDescriptor;
-        if (metadata != null) {
-            aaDescriptor = metadata.getAttributeAuthorityDescriptor(SAMLConstants.SAML20P_NS);
-            if (aaDescriptor != null) {
-                List<org.opensaml.saml2.core.Attribute> metadataAttributes = aaDescriptor.getAttributes();
-                metadataAttributeIds = getAttributeIds(metadataAttributes);
-                log.debug("metadata contains the following attributes: {}", metadataAttributeIds);
-            }
-        }
-
-        return metadataAttributeIds;
-    }
-
-    /**
-     * This parses the attribute ids from the supplied list of attributes.
-     * 
-     * @param attributes <code>List</code>
-     * @return <code>Set</code> of attribute ids
-     */
-    protected Set<String> getAttributeIds(List<org.opensaml.saml2.core.Attribute> attributes) {
-        final Set<String> attributeIds = new HashSet<String>();
-        for (org.opensaml.saml2.core.Attribute a : attributes) {
-            String attrId = getAttributeIDBySAMLAttribute(a);
-            if (attrId != null) {
-                attributeIds.add(attrId);
-            }
-        }
-        return attributeIds;
-    }
-
-    /** {@inheritDoc} */
-    protected void onNewContextCreated(ApplicationContext newServiceContext) throws ServiceException {
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/all-wcprops
deleted file mode 100644
index a443f30..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 122
-/java-shib-common/!svn/ver/1084/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver
-END
-AttributeResolver.java
-K 25
-svn:wc:ra_dav:version-url
-V 144
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/AttributeResolver.java
-END
-AttributeResolutionException.java
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/AttributeResolutionException.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/entries
deleted file mode 100644
index 15cb205..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/entries
+++ /dev/null
@@ -1,99 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-14T10:39:20.467478Z
-1084
-rdw
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-provider
-dir
-

-AttributeResolver.java
-file
-
-
-
-
-2014-02-19T17:27:41.814760Z
-cc9a0b6009061bd51d00df278e66a488
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2395
-

-AttributeResolutionException.java
-file
-
-
-
-
-2014-02-19T17:27:41.814760Z
-ca13a2e5d971c8d12d5ff352d15ca632
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2048
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/prop-base/AttributeResolutionException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/prop-base/AttributeResolutionException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/prop-base/AttributeResolutionException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/prop-base/AttributeResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/prop-base/AttributeResolver.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/prop-base/AttributeResolver.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/text-base/AttributeResolutionException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/text-base/AttributeResolutionException.java.svn-base
deleted file mode 100644
index b5704e4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/text-base/AttributeResolutionException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestException;
-
-/** An exception indicating a problem resolving a particular attribute. */
-public class AttributeResolutionException extends AttributeRequestException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = -1547150877337960805L;
-
-    /**
-     * Constructor.
-     */
-    public AttributeResolutionException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public AttributeResolutionException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeResolutionException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public AttributeResolutionException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/text-base/AttributeResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/text-base/AttributeResolver.java.svn-base
deleted file mode 100644
index bc4ba62..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/text-base/AttributeResolver.java.svn-base
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver;
-
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestContext;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-
-/**
- * The service that resolves the attributes for a particular subject.
- * 
- * @param <RequestContextType> the type of attribute request context used by the resolver.
- */
-public interface AttributeResolver<RequestContextType extends AttributeRequestContext> {
-
-    /**
-     * Gets all the attributes for a given subject. While an initial attribute producer is given this does not mean
-     * every returned attribute is from that producer. The producer may return information that can be used by data
-     * connectors to contact other producers and retrieve attributes from them.
-     * 
-     * @param requestContext the attribute resolution context to use to resolve attributes
-     * 
-     * @return the attributes describing the subject
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem resolving the attributes for the subject
-     */
-    public Map<String, BaseAttribute> resolveAttributes(RequestContextType requestContext)
-            throws AttributeResolutionException;
-
-    /**
-     * Check that the Attribute Resolver is in a valid state and ready to begin receiving resolution requests.
-     * 
-     * @throws AttributeResolutionException if resolver is in an invalid state
-     */
-    public void validate() throws AttributeResolutionException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/all-wcprops
deleted file mode 100644
index ca9bbf9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 131
-/java-shib-common/!svn/ver/1084/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider
-END
-ResolutionPlugIn.java
-K 25
-svn:wc:ra_dav:version-url
-V 152
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ResolutionPlugIn.java
-END
-AbstractResolutionPlugIn.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/AbstractResolutionPlugIn.java
-END
-ShibbolethAttributeResolver.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/1084/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ShibbolethAttributeResolver.java
-END
-ShibbolethResolutionContext.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ShibbolethResolutionContext.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/entries
deleted file mode 100644
index 07339e4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/entries
+++ /dev/null
@@ -1,173 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-14T10:39:20.467478Z
-1084
-rdw
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ResolutionPlugIn.java
-file
-
-
-
-
-2014-02-19T17:27:41.810759Z
-dd78a40d54ccc7986e0ca1b8e3e0daa0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2324
-

-dataConnector
-dir
-

-AbstractResolutionPlugIn.java
-file
-
-
-
-
-2014-02-19T17:27:41.810759Z
-0d69890db18bd8cbd44e492981741974
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5169
-

-ShibbolethAttributeResolver.java
-file
-
-
-
-
-2014-02-19T17:27:41.810759Z
-6523ff300c5ac35cf86f42f7e13f79de
-2013-08-14T10:39:20.467478Z
-1084
-rdw
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-24612
-

-attributeDefinition
-dir
-

-principalConnector
-dir
-

-ShibbolethResolutionContext.java
-file
-
-
-
-
-2014-02-19T17:27:41.814760Z
-e17013b789327aa84916c520d20d4dcd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3443
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/AbstractResolutionPlugIn.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/AbstractResolutionPlugIn.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/AbstractResolutionPlugIn.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ResolutionPlugIn.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ResolutionPlugIn.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ResolutionPlugIn.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ShibbolethAttributeResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ShibbolethAttributeResolver.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ShibbolethAttributeResolver.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ShibbolethResolutionContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ShibbolethResolutionContext.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/prop-base/ShibbolethResolutionContext.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/AbstractResolutionPlugIn.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/AbstractResolutionPlugIn.java.svn-base
deleted file mode 100644
index 3bf7ee2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/AbstractResolutionPlugIn.java.svn-base
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.AttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.DataConnector;
-
-
-/**
- * Base class for all {@link ResolutionPlugIn}s.
- * 
- * @param <ResolvedType> object type this plug-in resolves to
- */
-public abstract class AbstractResolutionPlugIn<ResolvedType> implements ResolutionPlugIn<ResolvedType> {
-
-    /** The identifier for this plug-in. */
-    private String id;
-
-    /** IDs of the {@link ResolutionPlugIn}s this plug-in depends on. */
-    private List<String> dependencyIds;
-
-    /** Constructor. */
-    public AbstractResolutionPlugIn() {
-        dependencyIds = new ArrayList<String>();
-    }
-
-    /** {@inheritDoc} */
-    public List<String> getDependencyIds() {
-        return dependencyIds;
-    }
-
-    /** {@inheritDoc} */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Set plug-in id.
-     * 
-     * @param newId new plug-in id
-     */
-    public void setId(String newId) {
-        id = newId;
-    }
-
-    /**
-     * Get values from dependencies.
-     * 
-     * @param context resolution context
-     * @param sourceAttribute ID of attribute to retrieve from dependencies
-     * @return collection of values
-     */
-    protected Collection<Object> getValuesFromAllDependencies(ShibbolethResolutionContext context, String sourceAttribute) {
-        List<Object> values = new ArrayList<Object>();
-    
-        for (String id : getDependencyIds()) {
-            if (context.getResolvedAttributeDefinitions().containsKey(id)) {
-                values.addAll(getValuesFromAttributeDependency(context, id));
-            } else if (context.getResolvedDataConnectors().containsKey(id)) {
-                values.addAll(getValuesFromConnectorDependency(context, id, sourceAttribute));
-            }
-        }
-    
-        return values;
-    }
-
-    /**
-     * Get values from attribute dependencies.
-     * 
-     * @param context resolution context
-     * @param id ID of attribute to retrieve dependencies for
-     * 
-     * @return collection of values
-     */
-    protected Collection<Object> getValuesFromAttributeDependency(ShibbolethResolutionContext context, String id) {
-        List<Object> values = new ArrayList<Object>();
-    
-        AttributeDefinition definition = context.getResolvedAttributeDefinitions().get(id);
-        if (definition != null) {
-            try {
-                BaseAttribute attribute = definition.resolve(context);
-                for (Object o : attribute.getValues()) {
-                    values.add(o);
-                }
-            } catch (AttributeResolutionException e) {
-                
-            }
-        }
-    
-        return values;
-    }
-
-    /**
-     * Get values from data connectors.
-     * 
-     * @param context resolution context
-     * @param id ID of attribute to retrieve dependencies for
-     * @param sourceAttribute ID of attribute to retrieve from connector dependencies
-     * 
-     * @return collection of values
-     */
-    protected Collection<Object> getValuesFromConnectorDependency(ShibbolethResolutionContext context, String id, String sourceAttribute) {
-        List<Object> values = new ArrayList<Object>();
-    
-        DataConnector connector = context.getResolvedDataConnectors().get(id);
-        if (connector != null) {
-            try {
-                Map<String, BaseAttribute> attributes = connector.resolve(context);
-                for (String attributeId : attributes.keySet()) {
-                    if (attributeId != null && attributeId.equals(sourceAttribute)) {
-                        for (Object o : attributes.get(attributeId).getValues()) {
-                            values.add(o);
-                        }
-                    }
-                }
-            } catch (AttributeResolutionException e) {
-                
-            }
-    
-        }
-    
-        return values;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ResolutionPlugIn.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ResolutionPlugIn.java.svn-base
deleted file mode 100644
index d41cd36..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ResolutionPlugIn.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider;
-
-import java.util.List;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-
-/**
- * A base interface for plugins that provide attributes.
- * 
- * @param <ResolvedType> object type this plug-in resolves to
- */
-public interface ResolutionPlugIn<ResolvedType> {
-
-    /**
-     * Returns the unique ID of the plugin.
-     * 
-     * @return unique ID of the plugin
-     */
-    public String getId();
-
-    /**
-     * Gets the IDs of the resolution plugins this plugin is dependent on.
-     * 
-     * @return IDs of the data connectors this plugin is dependent on
-     */
-    public List<String> getDependencyIds();
-
-    /**
-     * Performs the attribute resolution for this plugin.
-     * 
-     * @param resolutionContext the context for the resolution
-     * 
-     * @return the attributes made available by the resolution, never null
-     * 
-     * @throws AttributeResolutionException the problem that occurred during the resolution
-     */
-    public ResolvedType resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException;
-    
-    /**
-     * Validate the internal state of this plug-in.  This process may not rely on information from any dependency.
-     * 
-     * @throws AttributeResolutionException if the plug-in has an invalid internal state
-     */
-    public void validate() throws AttributeResolutionException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ShibbolethAttributeResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ShibbolethAttributeResolver.java.svn-base
deleted file mode 100644
index be265d5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ShibbolethAttributeResolver.java.svn-base
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-
-import org.jgrapht.DirectedGraph;
-import org.jgrapht.graph.DefaultEdge;
-import org.opensaml.common.SAMLObject;
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.saml2.core.NameID;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolver;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.AttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.ContextualAttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.ContextualDataConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.DataConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.ContextualPrincipalConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.PrincipalConnector;
-import edu.internet2.middleware.shibboleth.common.config.BaseReloadableService;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/**
- * Primary implementation of {@link AttributeResolver}.
- * 
- * "Raw" attributes are gathered by the registered {@link DataConnector}s while the {@link AttributeDefinition}s refine
- * the raw attributes or create attributes of their own. Connectors and definitions may depend on each other so
- * implementations must use a directed dependency graph when performing the resolution.
- */
-public class ShibbolethAttributeResolver extends BaseReloadableService implements
-        AttributeResolver<SAMLProfileRequestContext> {
-
-    /** Resolution plug-in types. */
-    public static final Collection<Class> PLUGIN_TYPES = Arrays.asList(new Class[] {DataConnector.class,
-            AttributeDefinition.class, PrincipalConnector.class,});
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethAttributeResolver.class.getName());
-
-    /** Data connectors defined for this resolver. */
-    private Map<String, DataConnector> dataConnectors;
-
-    /** Attribute definitions defined for this resolver. */
-    private Map<String, AttributeDefinition> definitions;
-
-    /** Principal connectors defined for this resolver. */
-    private Map<String, PrincipalConnector> principalConnectors;
-
-    /** Constructor. */
-    public ShibbolethAttributeResolver() {
-        super();
-        dataConnectors = new HashMap<String, DataConnector>();
-        definitions = new HashMap<String, AttributeDefinition>();
-        principalConnectors = new HashMap<String, PrincipalConnector>();
-    }
-
-    /**
-     * Gets the attribute definitions registered with this resolver.
-     * 
-     * @return attribute definitions registered with this resolver
-     */
-    public Map<String, AttributeDefinition> getAttributeDefinitions() {
-        return definitions;
-    }
-
-    /**
-     * Gets the data connectors registered with this provider.
-     * 
-     * @return data connectors registered with this provider
-     */
-    public Map<String, DataConnector> getDataConnectors() {
-        return dataConnectors;
-    }
-
-    /**
-     * Gets the principal connectors registered with this resolver.
-     * 
-     * @return principal connectors registered with this resolver
-     */
-    public Map<String, PrincipalConnector> getPrincipalConnectors() {
-        return principalConnectors;
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> resolveAttributes(SAMLProfileRequestContext attributeRequestContext)
-            throws AttributeResolutionException {
-        ShibbolethResolutionContext resolutionContext = new ShibbolethResolutionContext(attributeRequestContext);
-
-        log.debug("{} resolving attributes for principal {}", getId(), attributeRequestContext.getPrincipalName());
-
-        if (getAttributeDefinitions().size() == 0) {
-            log.debug("No attribute definitions loaded in {} so no attributes can be resolved for principal {}",
-                    getId(), attributeRequestContext.getPrincipalName());
-            return new HashMap<String, BaseAttribute>();
-        }
-
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        Map<String, BaseAttribute> resolvedAttributes = null;
-        try {
-            resolvedAttributes = resolveAttributes(resolutionContext);
-            cleanResolvedAttributes(resolvedAttributes, resolutionContext);
-        } finally {
-            readLock.unlock();
-        }
-
-        log.debug(getId() + " resolved, for principal {}, the attributes: {}",
-                attributeRequestContext.getPrincipalName(), resolvedAttributes.keySet());
-        return resolvedAttributes;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        for (DataConnector plugin : dataConnectors.values()) {
-            if (plugin != null) {
-                validateDataConnector(plugin);
-            }
-        }
-
-        for (AttributeDefinition plugin : definitions.values()) {
-            if (plugin != null) {
-                plugin.validate();
-            }
-        }
-
-        for (PrincipalConnector plugin : principalConnectors.values()) {
-            if (plugin != null) {
-                plugin.validate();
-            }
-        }
-    }
-
-    /**
-     * Validates that a data connector is valid, per {@link ResolutionPlugIn#validate()} and, if invalid, fails over to
-     * a connector's failover connector, if present.
-     * 
-     * @param connector connector to validate
-     * 
-     * @throws AttributeResolutionException thrown if the connector is invalid and does not define a failover connector
-     *             or, if a failover connector is defined, if that connector is invalid
-     */
-    protected void validateDataConnector(DataConnector connector) throws AttributeResolutionException {
-        try {
-            connector.validate();
-        } catch (AttributeResolutionException e) {
-            if (connector.getFailoverDependencyId() != null) {
-                DataConnector failoverConnector = dataConnectors.get(connector.getFailoverDependencyId());
-                if (failoverConnector != null) {
-                    validateDataConnector(failoverConnector);
-                    return;
-                }
-            }
-
-            throw e;
-        }
-    }
-
-    /**
-     * Resolves the principal name for the subject of the request.
-     * 
-     * @param requestContext current request context
-     * 
-     * @return principal name for the subject of the request
-     * 
-     * @throws AttributeResolutionException thrown if the subject identifier information can not be resolved into a
-     *             principal name
-     */
-    public String resolvePrincipalName(SAMLProfileRequestContext requestContext) throws AttributeResolutionException {
-        String nameIdFormat = getNameIdentifierFormat(requestContext.getSubjectNameIdentifier());
-
-        log.debug("Resolving principal name from name identifier of format: {}", nameIdFormat);
-
-        PrincipalConnector effectiveConnector = null;
-        for (PrincipalConnector connector : principalConnectors.values()) {
-            if (connector.getFormat().equals(nameIdFormat)) {
-                if (connector.getRelyingParties().contains(requestContext.getInboundMessageIssuer())) {
-                    effectiveConnector = connector;
-                    break;
-                }
-
-                if (connector.getRelyingParties().isEmpty()) {
-                    effectiveConnector = connector;
-                }
-            }
-        }
-
-        if (effectiveConnector == null) {
-            throw new AttributeResolutionException(
-                    "No principal connector available to resolve a subject name with format " + nameIdFormat
-                            + " for relying party " + requestContext.getInboundMessageIssuer());
-        }
-        log.debug("Using principal connector {} to resolve principal name.", effectiveConnector.getId());
-        effectiveConnector = new ContextualPrincipalConnector(effectiveConnector);
-
-        ShibbolethResolutionContext resolutionContext = new ShibbolethResolutionContext(requestContext);
-
-        // resolve all the connectors dependencies
-        resolveDependencies(effectiveConnector, resolutionContext);
-
-        return effectiveConnector.resolve(resolutionContext);
-    }
-
-    /**
-     * Gets the format of the name identifier used to identify the subject.
-     * 
-     * @param nameIdentifier name identifier used to identify the subject
-     * 
-     * @return format of the name identifier used to identify the subject
-     */
-    protected String getNameIdentifierFormat(SAMLObject nameIdentifier) {
-        String subjectNameFormat = null;
-
-        if (nameIdentifier instanceof NameIdentifier) {
-            NameIdentifier identifier = (NameIdentifier) nameIdentifier;
-            subjectNameFormat = identifier.getFormat();
-        } else if (nameIdentifier instanceof NameID) {
-            NameID identifier = (NameID) nameIdentifier;
-            subjectNameFormat = identifier.getFormat();
-        }
-
-        if (DatatypeHelper.isEmpty(subjectNameFormat)) {
-            subjectNameFormat = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
-        }
-
-        return subjectNameFormat;
-    }
-
-    /**
-     * Resolves the attributes requested in the resolution context or all attributes if no specific attributes were
-     * requested. This method does not remove dependency only attributes or attributes that do not contain values.
-     * 
-     * @param resolutionContext current resolution context
-     * 
-     * @return resolved attributes
-     * 
-     * @throws AttributeResolutionException thrown if the attributes could not be resolved
-     */
-    protected Map<String, BaseAttribute> resolveAttributes(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        Collection<String> attributeIDs = resolutionContext.getAttributeRequestContext().getRequestedAttributesIds();
-        Map<String, BaseAttribute> resolvedAttributes = new HashMap<String, BaseAttribute>();
-
-        // if no attributes requested, then resolve everything
-        if (attributeIDs == null || attributeIDs.isEmpty()) {
-            log.debug("Specific attributes for principal {} were not requested, resolving all attributes.",
-                    resolutionContext.getAttributeRequestContext().getPrincipalName());
-            attributeIDs = getAttributeDefinitions().keySet();
-        }
-
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        try {
-            for (String attributeID : attributeIDs) {
-                BaseAttribute resolvedAttribute = resolveAttribute(attributeID, resolutionContext);
-                if (resolvedAttribute != null) {
-                    resolvedAttributes.put(resolvedAttribute.getId(), resolvedAttribute);
-                }
-            }
-        } finally {
-            readLock.unlock();
-        }
-
-        return resolvedAttributes;
-    }
-
-    /**
-     * Resolve the {@link AttributeDefinition} which has the specified ID. The definition is then added to the
-     * {@link ShibbolethResolutionContext} for use by other {@link ResolutionPlugIn}s and the resolution of the
-     * specified definition is added to <code>resolvedAttributes</code> to be returned by the resolver.
-     * 
-     * @param attributeID id of the attribute definition to resolve
-     * @param resolutionContext resolution context that we are working in
-     * 
-     * @return resolution of the specified attribute definition
-     * 
-     * @throws AttributeResolutionException if unable to resolve the requested attribute definition
-     */
-    protected BaseAttribute resolveAttribute(String attributeID, ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-
-        AttributeDefinition definition = resolutionContext.getResolvedAttributeDefinitions().get(attributeID);
-
-        if (definition == null) {
-            log.debug("Resolving attribute {} for principal {}", attributeID, resolutionContext
-                    .getAttributeRequestContext().getPrincipalName());
-
-            definition = getAttributeDefinitions().get(attributeID);
-            if (definition == null) {
-                log.warn("{} requested attribute {} but no attribute definition exists for that attribute",
-                        resolutionContext.getAttributeRequestContext().getInboundMessageIssuer(), attributeID);
-                return null;
-            } else {
-                // wrap attribute definition for use within the given resolution context
-                definition = new ContextualAttributeDefinition(definition);
-
-                // register definition as resolved for this resolution context
-                resolutionContext.getResolvedPlugins().put(attributeID, definition);
-            }
-        }
-
-        // resolve all the definitions dependencies
-        resolveDependencies(definition, resolutionContext);
-
-        // return the actual resolution of the definition
-        BaseAttribute attribute = definition.resolve(resolutionContext);
-        log.debug("Resolved attribute {} containing {} values", attributeID, attribute.getValues().size());
-        return attribute;
-    }
-
-    /**
-     * Resolve the {@link DataConnector} which has the specified ID and add it to the resolution context.
-     * 
-     * @param connectorID id of the data connector to resolve
-     * @param resolutionContext resolution context that we are working in
-     * 
-     * @throws AttributeResolutionException if unable to resolve the requested connector
-     */
-    protected void resolveDataConnector(String connectorID, ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-
-        DataConnector dataConnector = resolutionContext.getResolvedDataConnectors().get(connectorID);
-
-        if (dataConnector == null) {
-            log.debug("Resolving data connector {} for principal {}", connectorID, resolutionContext
-                    .getAttributeRequestContext().getPrincipalName());
-
-            dataConnector = getDataConnectors().get(connectorID);
-            if (dataConnector == null) {
-                log.warn("{} requested to resolve data connector {} but does not have such a data connector", getId(),
-                        connectorID);
-            } else {
-                // wrap connector for use within the given resolution context
-                dataConnector = new ContextualDataConnector(dataConnector);
-
-                // register connector as resolved for this resolution context
-                resolutionContext.getResolvedPlugins().put(connectorID, dataConnector);
-            }
-        }
-
-        // resolve all the connectors dependencies
-        resolveDependencies(dataConnector, resolutionContext);
-
-        try {
-            dataConnector.resolve(resolutionContext);
-        } catch (AttributeResolutionException e) {
-            String failoverDataConnectorId = dataConnector.getFailoverDependencyId();
-
-            if (DatatypeHelper.isEmpty(failoverDataConnectorId)) {
-                log.error("Received the following error from data connector " + dataConnector.getId()
-                        + ", no failover data connector available", e);
-                throw e;
-            }
-
-            log.warn("Received the following error from data connector " + dataConnector.getId()
-                    + ", trying its failover connector " + failoverDataConnectorId, e.getMessage());
-            log.debug("Error recieved from data connector " + dataConnector.getId(), e);
-            resolveDataConnector(failoverDataConnectorId, resolutionContext);
-
-            DataConnector failoverConnector =
-                    resolutionContext.getResolvedDataConnectors().get(failoverDataConnectorId);
-            log.debug("Using failover connector {} in place of {} for the remainder of this resolution",
-                    failoverConnector.getId(), connectorID);
-            resolutionContext.getResolvedPlugins().put(connectorID, failoverConnector);
-        }
-    }
-
-    /**
-     * Resolves all the dependencies for a given plugin.
-     * 
-     * @param plugin plugin whose dependencies should be resolved
-     * @param resolutionContext current resolution context
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem resolving a dependency
-     */
-    protected void resolveDependencies(ResolutionPlugIn<?> plugin, ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-
-        for (String dependency : plugin.getDependencyIds()) {
-            if (dataConnectors.containsKey(dependency)) {
-                resolveDataConnector(dependency, resolutionContext);
-            } else if (definitions.containsKey(dependency)) {
-                resolveAttribute(dependency, resolutionContext);
-            }
-        }
-    }
-
-    /**
-     * Removes attributes that contain no values or those which are dependency only.
-     * 
-     * @param resolvedAttributes attribute set to clean up
-     * @param resolutionContext current resolution context
-     */
-    protected void cleanResolvedAttributes(Map<String, BaseAttribute> resolvedAttributes,
-            ShibbolethResolutionContext resolutionContext) {
-        AttributeDefinition attributeDefinition;
-
-        Iterator<Entry<String, BaseAttribute>> attributeItr = resolvedAttributes.entrySet().iterator();
-        BaseAttribute<?> resolvedAttribute;
-        Set<Object> values;
-        while (attributeItr.hasNext()) {
-            resolvedAttribute = attributeItr.next().getValue();
-
-            // remove nulls
-            if (resolvedAttribute == null) {
-                attributeItr.remove();
-                continue;
-            }
-
-            // remove dependency-only attributes
-            attributeDefinition = getAttributeDefinitions().get(resolvedAttribute.getId());
-            if (null == attributeDefinition) {
-                log.warn("Attribute definition {} produced no attribute.", resolvedAttribute.getId());
-                continue;
-            }
-            
-            if (attributeDefinition.isDependencyOnly()) {
-                log.debug("Removing dependency-only attribute {} from resolution result for principal {}.",
-                        resolvedAttribute.getId(), resolutionContext.getAttributeRequestContext().getPrincipalName());
-                attributeItr.remove();
-                continue;
-            }
-
-            // remove value-less attributes
-            if (resolvedAttribute.getValues().size() == 0) {
-                log.debug("Removing attribute {} from resolution result for principal {}.  It contains no values.",
-                        resolvedAttribute.getId(), resolutionContext.getAttributeRequestContext().getPrincipalName());
-                attributeItr.remove();
-                continue;
-            }
-
-            // remove duplicate attribute values
-            Iterator<?> valueItr = resolvedAttribute.getValues().iterator();
-            values = new HashSet<Object>();
-            while (valueItr.hasNext()) {
-                Object value = valueItr.next();
-                if (!values.add(value)) {
-                    log.debug("Removing duplicate value {} of attribute {} from resolution result", value,
-                            resolvedAttribute.getId());
-                    valueItr.remove();
-                }
-            }
-
-            log.debug("Attribute {} has {} values after post-processing", resolvedAttribute.getId(), resolvedAttribute
-                    .getValues().size());
-        }
-    }
-
-    /**
-     * Add a resolution plug-in and dependencies to a directed graph.
-     * 
-     * @param graph directed graph
-     * @param plugin plug-in to add
-     */
-    protected void addVertex(DirectedGraph<ResolutionPlugIn, DefaultEdge> graph, ResolutionPlugIn<?> plugin) {
-        graph.addVertex(plugin);
-        ResolutionPlugIn<?> dependency = null;
-
-        // add edges for dependencies
-        for (String id : plugin.getDependencyIds()) {
-            if (dataConnectors.containsKey(id)) {
-                dependency = dataConnectors.get(id);
-            } else if (definitions.containsKey(id)) {
-                dependency = definitions.get(id);
-            }
-
-            if (dependency != null) {
-                graph.addVertex(dependency);
-                graph.addEdge(plugin, dependency);
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected void onNewContextCreated(ApplicationContext newServiceContext) throws ServiceException {
-        String[] beanNames;
-
-        Map<String, DataConnector> oldDataConnectors = dataConnectors;
-        Map<String, DataConnector> newDataConnectors = new HashMap<String, DataConnector>();
-        DataConnector dConnector;
-        beanNames = newServiceContext.getBeanNamesForType(DataConnector.class);
-        log.debug("Loading {} data connectors", beanNames.length);
-        for (String beanName : beanNames) {
-            dConnector = (DataConnector) newServiceContext.getBean(beanName);
-            newDataConnectors.put(dConnector.getId(), dConnector);
-        }
-
-        Map<String, AttributeDefinition> oldAttributeDefinitions = definitions;
-        Map<String, AttributeDefinition> newAttributeDefinitions = new HashMap<String, AttributeDefinition>();
-        AttributeDefinition aDefinition;
-        beanNames = newServiceContext.getBeanNamesForType(AttributeDefinition.class);
-        log.debug("Loading {} attribute definitions", beanNames.length);
-        for (String beanName : beanNames) {
-            aDefinition = (AttributeDefinition) newServiceContext.getBean(beanName);
-            newAttributeDefinitions.put(aDefinition.getId(), aDefinition);
-        }
-
-        Map<String, PrincipalConnector> oldPrincipalConnectors = principalConnectors;
-        Map<String, PrincipalConnector> newPrincipalConnectors = new HashMap<String, PrincipalConnector>();
-        PrincipalConnector pConnector;
-        beanNames = newServiceContext.getBeanNamesForType(PrincipalConnector.class);
-        log.debug("Loading {} principal connectors", beanNames.length);
-        for (String beanName : beanNames) {
-            pConnector = (PrincipalConnector) newServiceContext.getBean(beanName);
-            newPrincipalConnectors.put(pConnector.getId(), pConnector);
-        }
-
-        try {
-            dataConnectors = newDataConnectors;
-            definitions = newAttributeDefinitions;
-            principalConnectors = newPrincipalConnectors;
-            validate();
-        } catch (AttributeResolutionException e) {
-            dataConnectors = oldDataConnectors;
-            definitions = oldAttributeDefinitions;
-            principalConnectors = oldPrincipalConnectors;
-            throw new ServiceException(getId() + " configuration is not valid, retaining old configuration", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ShibbolethResolutionContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ShibbolethResolutionContext.java.svn-base
deleted file mode 100644
index 60ffc1b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/text-base/ShibbolethResolutionContext.java.svn-base
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider;
-
-import java.util.Map;
-
-import org.opensaml.xml.util.ValueTypeIndexedMap;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.AttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.DataConnector;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-
-/**
- * Contextual information for performing an attribute resolution.
- */
-public class ShibbolethResolutionContext {
-
-    /** Attribute request context. */
-    private SAMLProfileRequestContext requestContext;
-
-    /** Resolution plug-ins that have been resolved for this request. */
-    private ValueTypeIndexedMap<String, ResolutionPlugIn> resolvedPlugins;
-
-    /**
-     * Constructor.
-     * 
-     * @param context the attribute request this resolution is being performed for
-     */
-    public ShibbolethResolutionContext(SAMLProfileRequestContext context) {
-        requestContext = context;
-        resolvedPlugins = new ValueTypeIndexedMap<String, ResolutionPlugIn>(ShibbolethAttributeResolver.PLUGIN_TYPES);
-    }
-
-    /**
-     * Gets the attribute request that started this resolution.
-     * 
-     * @return attribute request that started this resolution
-     */
-    public SAMLProfileRequestContext getAttributeRequestContext() {
-        return requestContext;
-    }
-
-    /**
-     * Get the resolution plug-ins that have been resolved for this request.
-     * 
-     * @return the plug-ins that have been resolved for this request.
-     */
-    public Map<String, ResolutionPlugIn> getResolvedPlugins() {
-        return resolvedPlugins;
-    }
-
-    /**
-     * Get an unmodifiable map of the attribute definitions that have been resolved for this request. To add new
-     * definitions, use {@link #getResolvedPlugins} to retrieve a modifiable collection.
-     * 
-     * @return definitions that have been resolved for this request
-     */
-    public Map<String, AttributeDefinition> getResolvedAttributeDefinitions() {
-        return resolvedPlugins.subMap(AttributeDefinition.class);
-    }
-
-    /**
-     * Get an unmodifiable map of the data connectors that have been resolved for this request. To add new connectors,
-     * use {@link #getResolvedPlugins} to retrieve a modifiable collection.
-     * 
-     * @return connectors that have been resolved for this request
-     */
-    public Map<String, DataConnector> getResolvedDataConnectors() {
-        return resolvedPlugins.subMap(DataConnector.class);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/all-wcprops
deleted file mode 100644
index 268f343..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/all-wcprops
+++ /dev/null
@@ -1,113 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition
-END
-ScriptedAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 183
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/ScriptedAttributeDefinition.java
-END
-ScopedAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/ScopedAttributeDefinition.java
-END
-ValueMap.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/ValueMap.java
-END
-AttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 175
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/AttributeDefinition.java
-END
-SAML1NameIdentifierAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 194
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/SAML1NameIdentifierAttributeDefinition.java
-END
-TransientIdAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TransientIdAttributeDefinition.java
-END
-PrescopedAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 184
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/PrescopedAttributeDefinition.java
-END
-CryptoTransientIdAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 193
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/CryptoTransientIdAttributeDefinition.java
-END
-RegexSplitAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/RegexSplitAttributeDefinition.java
-END
-ContextualAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/ContextualAttributeDefinition.java
-END
-SimpleAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/SimpleAttributeDefinition.java
-END
-SAML2NameIDAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/SAML2NameIDAttributeDefinition.java
-END
-PrincipalNameDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 179
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/PrincipalNameDefinition.java
-END
-PrincipalAuthenticationMethodDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 195
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/PrincipalAuthenticationMethodDefinition.java
-END
-MappedAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/MappedAttributeDefinition.java
-END
-TransientIdEntry.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TransientIdEntry.java
-END
-BaseAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 179
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/BaseAttributeDefinition.java
-END
-TemplateAttributeDefinition.java
-K 25
-svn:wc:ra_dav:version-url
-V 184
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/TemplateAttributeDefinition.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/entries
deleted file mode 100644
index 39dd145..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/entries
+++ /dev/null
@@ -1,640 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-MappedAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-9be0112796532f4329821fab9d2b3a61
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6356
-

-TransientIdEntry.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-357490a3a787cd30808b189b82aa0150
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2564
-

-BaseAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-5a3efe651b9fc72602cff8277a49882d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6305
-

-TemplateAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-570cc6d563a3f8ca5898b449bc9de9a5
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7519
-

-ScriptedAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-508c594a9500c7755e1097f79e3e014e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7583
-

-ScopedAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-f5fe60194580301846e24b0eddbcb4e9
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3069
-

-ValueMap.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-41d3eddd4588bf17bd083f7626e072f4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6047
-

-AttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-e17fdbbc1173409940b3ef02a6f59f09
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2644
-

-SAML1NameIdentifierAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-da3d8ee022e18a09ee6fb232318c9359
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5417
-

-TransientIdAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-405131399c09ab52809c65eb547e130e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6338
-

-PrescopedAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-653ce32724a2d4a7dd6dcb481ed178c6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3669
-

-CryptoTransientIdAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-6765d7133fb36a6f7d0e12018f63a476
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5057
-

-RegexSplitAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.726758Z
-758af4af394d60a6912c14123c04f247
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3643
-

-ContextualAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.722758Z
-b1c2c90a0668d214976b92c53e417278
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3420
-

-SimpleAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.726758Z
-684663ef044114e4459fe9d21d60df90
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2129
-

-SAML2NameIDAttributeDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.726758Z
-fe61340b70ad3e6b74fbed8150f634b8
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5998
-

-PrincipalNameDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.726758Z
-4868670aaa959919c7169dbd4700d1e7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2090
-

-PrincipalAuthenticationMethodDefinition.java
-file
-
-
-
-
-2014-02-19T17:27:41.726758Z
-9220a74f3e292cf4053e8705af1a77ef
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2154
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/AttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/AttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/AttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/BaseAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/BaseAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/BaseAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ContextualAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ContextualAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ContextualAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/MappedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/MappedAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/MappedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrincipalNameDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrincipalNameDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/PrincipalNameDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ScopedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ScopedAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ScopedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SimpleAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SimpleAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/SimpleAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TemplateAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TemplateAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TemplateAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinition.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TransientIdEntry.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TransientIdEntry.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/TransientIdEntry.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ValueMap.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ValueMap.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/ValueMap.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/AttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/AttributeDefinition.java.svn-base
deleted file mode 100644
index d8476e2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/AttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ResolutionPlugIn;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.DataConnector;
-
-/**
- * A plugin used to create attributes or refine attributes provided from {@link DataConnector}s.
- * 
- * Attribute definitions must be stateless and thread-safe as a single instance may be used to service every request.
- */
-public interface AttributeDefinition extends ResolutionPlugIn<BaseAttribute> {
-
-    /**
-     * Gets the localized human readable description of attribute.
-     * 
-     * @return human readable description of attribute
-     */
-    public Map<Locale, String> getDisplayDescriptions();
-
-    /**
-     * Gets the localized human readable name of the attribute.
-     * 
-     * @return human readable name of the attribute
-     */
-    public Map<Locale, String> getDisplayNames();
-    
-    /**
-     * Gets the map of encoders to be added to attributes produced by this definition, keyed on encoder category.
-     * 
-     * @return encoders to be added to attributes produced by this definition
-     */
-    public List<AttributeEncoder> getAttributeEncoders();
-    
-    /**
-     * Gets whether this attribute definition is only a dependency and thus its values should never be released outside
-     * the resolver.
-     * 
-     * @return whether this attribute definition is only a dependency
-     */
-    public boolean isDependencyOnly();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/BaseAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/BaseAttributeDefinition.java.svn-base
deleted file mode 100644
index 0fac171..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/BaseAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.opensaml.xml.util.LazyMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.AbstractResolutionPlugIn;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Base class for {@link AttributeDefinition} plug-ins.
- */
-public abstract class BaseAttributeDefinition extends AbstractResolutionPlugIn<BaseAttribute> implements
-        AttributeDefinition {
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseAttributeDefinition.class);
-
-    /** Whether this attribute definition is only a dependency and thus its values should never be released. */
-    private boolean dependencyOnly;
-
-    /** Attribute encoders associated with this definition. */
-    private ArrayList<AttributeEncoder> encoders;
-
-    /** Name of the attribute from data connectors to use to populate this definition. */
-    private String sourceAttributeID;
-
-    /** Localized human intelligible attribute name. */
-    private Map<Locale, String> displayNames;
-    
-    /** Localized human readable description of attribute. */
-    private Map<Locale, String> displayDescriptions;
-
-    /** Constructor. */
-    public BaseAttributeDefinition() {
-        dependencyOnly = false;
-        encoders = new ArrayList<AttributeEncoder>(3);
-        displayNames = new LazyMap<Locale, String>();
-        displayDescriptions = new LazyMap<Locale, String>();
-    }
-    
-    /**
-     * Gets the localized human readable description of attribute.
-     * 
-     * @return human readable description of attribute
-     */
-    public Map<Locale, String> getDisplayDescriptions() {
-        return displayDescriptions;
-    }
-
-    /**
-     * Gets the localized human readable name of the attribute.
-     * 
-     * @return human readable name of the attribute
-     */
-    public Map<Locale, String> getDisplayNames() {
-        return displayNames;
-    }
-
-    /** {@inheritDoc} */
-    public boolean isDependencyOnly() {
-        return dependencyOnly;
-    }
-
-    /**
-     * Sets whether this attribute definition is only a dependency and thus its values should never be released outside
-     * the resolver.
-     * 
-     * @param isDependencyOnly whether this attribute definition is only a dependency
-     */
-    public void setDependencyOnly(boolean isDependencyOnly) {
-        dependencyOnly = isDependencyOnly;
-    }
-
-    /** {@inheritDoc} */
-    public List<AttributeEncoder> getAttributeEncoders() {
-        return encoders;
-    }
-
-    /** {@inheritDoc} */
-    public BaseAttribute resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        BaseAttribute resolvedAttribute = doResolve(resolutionContext);
-
-        if(resolvedAttribute == null){
-            log.error("{} produced a null attribute, this is not allowed", getId());
-            throw new AttributeResolutionException(getId() + " produced a null attribute");
-        }
-        
-        if(getDisplayNames() != null) {
-            resolvedAttribute.getDisplayNames().putAll(displayNames);
-        }
-        
-        if(getDisplayDescriptions() != null){
-            resolvedAttribute.getDisplayDescriptions().putAll(displayDescriptions);
-        }
-        
-        if (getAttributeEncoders() != null) {
-            resolvedAttribute.getEncoders().addAll(getAttributeEncoders());
-        }
-
-        return resolvedAttribute;
-    }
-
-    /**
-     * Creates and populates the values for the resolved attribute. Implementations should *not* set, or otherwise
-     * manage, the attribute encoders for the resolved attribute.
-     * 
-     * @param resolutionContext current attribute resolution context
-     * 
-     * @return resolved attribute
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem resolving and creating the attribute
-     */
-    protected abstract BaseAttribute doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException;
-
-    /**
-     * Get values from dependencies.
-     * 
-     * @param context resolution context
-     * @return collection of values
-     */
-    protected Collection<Object> getValuesFromAllDependencies(ShibbolethResolutionContext context) {
-        return getValuesFromAllDependencies(context, getSourceAttributeID());
-    }
-
-    /**
-     * Return the source attribute. If the source attribute is null, return the definition ID.
-     * 
-     * @return Returns the sourceAttribute.
-     */
-    public String getSourceAttributeID() {
-        if (sourceAttributeID != null) {
-            return sourceAttributeID;
-        } else {
-            return getId();
-        }
-    }
-
-    /**
-     * Set the source attribute.
-     * 
-     * @param newSourceAttributeID The sourceAttribute to set.
-     */
-    public void setSourceAttributeID(String newSourceAttributeID) {
-        sourceAttributeID = newSourceAttributeID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ContextualAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ContextualAttributeDefinition.java.svn-base
deleted file mode 100644
index 89d25b0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ContextualAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Wrapper for an {@link AttributeDefinition} within a {@link ShibbolethResolutionContext}. This wrapper ensures that
- * the definition is resolved only once per context.
- */
-public class ContextualAttributeDefinition implements AttributeDefinition {
-
-    /** Wrapped attribute definition. */
-    private AttributeDefinition definition;
-
-    /** Cached result of resolving the attribute definition. */
-    private BaseAttribute attribute;
-
-    /**
-     * Constructor.
-     * 
-     * @param newDefinition attribute definition to wrap
-     */
-    public ContextualAttributeDefinition(AttributeDefinition newDefinition) {
-        definition = newDefinition;
-    }
-
-    /** {@inheritDoc} */
-    public boolean equals(Object obj) {
-        return definition.equals(obj);
-    }
-
-    /** {@inheritDoc} */
-    public List<AttributeEncoder> getAttributeEncoders() {
-        return definition.getAttributeEncoders();
-    }
-
-    /** {@inheritDoc} */
-    public List<String> getDependencyIds() {
-        return definition.getDependencyIds();
-    }
-
-    /** {@inheritDoc} */
-    public Map<Locale, String> getDisplayDescriptions() {
-        return definition.getDisplayDescriptions();
-    }
-
-    /** {@inheritDoc} */
-    public Map<Locale, String> getDisplayNames() {
-        return definition.getDisplayNames();
-    }
-
-    /** {@inheritDoc} */
-    public String getId() {
-        return definition.getId();
-    }
-
-    /** {@inheritDoc} */
-    public int hashCode() {
-        return definition.hashCode();
-    }
-
-    /** {@inheritDoc} */
-    public boolean isDependencyOnly() {
-        return definition.isDependencyOnly();
-    }
-
-    /** {@inheritDoc} */
-    public BaseAttribute resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        if (attribute == null) {
-            attribute = definition.resolve(resolutionContext);
-        }
-
-        return attribute;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        definition.validate();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinition.java.svn-base
deleted file mode 100644
index cf95802..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.util.DataSealer;
-import edu.internet2.middleware.shibboleth.common.util.DataSealerException;
-
-/**
- * An attribute definition that generates integrity protected,
- * encrypted identifiers useful for stateless transient subject IDs.
- */
-public class CryptoTransientIdAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(CryptoTransientIdAttributeDefinition.class);
-    
-    /** Object used to protect and encrypt the data. */
-    private DataSealer dataSealer;
-
-    /** Length, in milliseconds, tokens are valid. */
-    private long idLifetime;
-
-    /**
-     * Constructor.
-     * 
-     * @param sealer object used to protect and encrypt the data
-     */
-    public CryptoTransientIdAttributeDefinition(DataSealer sealer) {
-        if (sealer == null) {
-            throw new IllegalArgumentException("DataSealer may not be null.");
-        }
-        dataSealer = sealer;
-        idLifetime = 1000 * 60 * 60 * 4;
-    }
-
-    /** {@inheritDoc} */
-    protected BaseAttribute<String> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-
-        BasicAttribute<String> attribute = new BasicAttribute<String>();
-        attribute.setId(getId());
-        
-        SAMLProfileRequestContext requestContext = resolutionContext.getAttributeRequestContext();
-
-        String principalName = requestContext.getPrincipalName();
-        if (principalName == null) {
-            log.debug("Principal name for request {} was null, no attribute value returned",
-                    requestContext.getInboundSAMLMessageId());
-            return attribute;
-        }
-
-        log.debug(
-                "Building crypto transient ID for request {}; outbound message issuer: {}, inbound message issuer: {}, principal identifer: {}",
-                new Object[] { requestContext.getInboundSAMLMessageId(), requestContext.getOutboundMessageIssuer(),
-                        requestContext.getInboundMessageIssuer(), principalName, });
-        
-        StringBuilder principalTokenIdBuilder = new StringBuilder();
-        principalTokenIdBuilder.append(requestContext.getOutboundMessageIssuer()).append("!").append(
-                requestContext.getInboundMessageIssuer()).append("!").append(principalName);
-        try {
-            String transientId = dataSealer.wrap(principalTokenIdBuilder.toString(), System.currentTimeMillis() + idLifetime);
-            attribute.getValues().add(transientId);
-        } catch (DataSealerException e) {
-            log.error("Caught exception wrapping principal identifier.", e);
-        }
-
-        return attribute;
-    }
-
-    /**
-     * Gets the time, in milliseconds, ids are valid.
-     * 
-     * @return time, in milliseconds, ids are valid
-     */
-    public long getIdLifetime() {
-        return idLifetime;
-    }
-
-    /**
-     * Sets the time, in milliseconds, ids are valid.
-     * 
-     * @param lifetime time, in milliseconds, ids are valid
-     */
-    public void setIdLifetime(long lifetime) {
-        idLifetime = lifetime;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if (dataSealer == null) {
-            log.error("CryptoTransientIdAttributeDefinition (" + getId()
-                    + ") must have a DataSealer object set.");
-            throw new AttributeResolutionException("CryptoTransientIdAttributeDefinition (" + getId()
-                    + ") must have a DataSealer object set.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/MappedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/MappedAttributeDefinition.java.svn-base
deleted file mode 100644
index ab1fa53..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/MappedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Set;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.LazySet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * The RegexAttributeDefinition allows regular expression based replacements on attribute values, using the regex syntax
- * allowed by {@link java.util.regex.Pattern}.
- */
-public class MappedAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(MappedAttributeDefinition.class);
-
-    /** Default return value. */
-    private String defaultValue;
-
-    /** Whether the definition passes thru unmatched values. */
-    private boolean passThru;
-
-    /** Value maps. */
-    private Collection<ValueMap> valueMaps;
-
-    /** Constructor. */
-    public MappedAttributeDefinition() {
-        valueMaps = new ArrayList<ValueMap>(5);
-    }
-
-    /** {@inheritDoc} */
-    protected BaseAttribute doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        BasicAttribute<String> attribute = new BasicAttribute<String>();
-        attribute.setId(getId());
-
-        Collection<?> values = getValuesFromAllDependencies(resolutionContext);
-        if (values == null || values.isEmpty()) {
-            log.debug("Attribute Definition {}: No values from dependency attribute attribute {}", getId(),
-                    getDependencyIds());
-            if (!DatatypeHelper.isEmpty(getDefaultValue())) {
-                log.debug(
-                        "Attribute Definition {}: Default value is not empty, adding it as the value for this attribute",
-                        getId());
-                attribute.getValues().add(getDefaultValue());
-            }
-            return attribute;
-        }
-
-        Set<String> mappedValues;
-        for (Object o : values) {
-            if (o == null) {
-                log.debug("Attribute Definition {}: null attribute value, skipping it", getId());
-                continue;
-            }
-            mappedValues = mapValue(o.toString());
-            attribute.getValues().addAll(mappedValues);
-        }
-
-        return attribute;
-    }
-
-    /**
-     * Maps the value from a dependency in to the value(s) for this attribute.
-     * 
-     * @param value the value from the dependency
-     * 
-     * @return the set of attribute values that the given dependency value maps in to
-     */
-    protected Set<String> mapValue(String value) {
-        log.debug("Attribute Definition {}: mapping depdenency attribute value {}", getId(), value);
-        
-        LazySet<String> mappedValues = new LazySet<String>();
-
-        boolean valueMapMatch = false;
-        if (!DatatypeHelper.isEmpty(value)) {
-            for (ValueMap valueMap : valueMaps) {
-                mappedValues.addAll(valueMap.evaluate(value));
-                if (!mappedValues.isEmpty()) {
-                    valueMapMatch = true;
-                }
-            }
-
-            if (!valueMapMatch) {
-                if (passThru) {
-                    mappedValues.add(value);
-                } else if (getDefaultValue() != null) {
-                    mappedValues.add(getDefaultValue());
-                }
-            }
-        }
-
-        log.debug("Attribute Definition {}: mapped depdenency attribute value {} to the values {}", new Object[] {
-                getId(), value, mappedValues, });
-        
-        return mappedValues;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if (passThru && !DatatypeHelper.isEmpty(defaultValue)) {
-            log.error("MappedAttributeDefinition (" + getId()
-                    + ") may not have a DefaultValue string with passThru enabled.");
-            throw new AttributeResolutionException("MappedAttributeDefinition (" + getId()
-                    + ") may not have a DefaultValue string with passThru enabled.");
-        }
-    }
-
-    /**
-     * Gets the default return value.
-     * 
-     * @return the default return value.
-     */
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    /**
-     * Sets the default return value.
-     * 
-     * @param newDefaultValue the default return value
-     */
-    public void setDefaultValue(String newDefaultValue) {
-        defaultValue = newDefaultValue;
-    }
-
-    /**
-     * Gets whether the definition passes thru unmatched values.
-     * 
-     * @return whether the definition passes thru unmatched values.
-     */
-    public boolean isPassThru() {
-        return passThru;
-    }
-
-    /**
-     * Sets whether the definition passes thru unmatched values.
-     * 
-     * @param newPassThru whether the definition passes thru unmatched values.
-     */
-    public void setPassThru(boolean newPassThru) {
-        passThru = newPassThru;
-    }
-
-    /**
-     * Get the value maps.
-     * 
-     * @return the value maps.
-     */
-    public Collection<ValueMap> getValueMaps() {
-        return valueMaps;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrescopedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrescopedAttributeDefinition.java.svn-base
deleted file mode 100644
index 9d1970d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrescopedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Collection;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * An attribute definition that creates {@link ScopedAttributeValue}s by taking a source attribute value splitting it
- * at a delimiter. The first atom becomes the attribute value and the second value becomes the scope.
- */
-public class PrescopedAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(PrescopedAttributeDefinition.class);
-
-    /** Delimiter between value and scope. */
-    private String scopeDelimiter;
-
-    /**
-     * Constructor.
-     * 
-     * @param delimiter scope of the attribute
-     */
-    public PrescopedAttributeDefinition(String delimiter) {
-        scopeDelimiter = delimiter;
-    }
-
-    /** {@inheritDoc} */
-    public BaseAttribute<ScopedAttributeValue> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        BasicAttribute<ScopedAttributeValue> attribute = new BasicAttribute<ScopedAttributeValue>();
-        attribute.setId(getId());
-
-        Collection<?> values = getValuesFromAllDependencies(resolutionContext);
-        if (values == null || values.isEmpty()) {
-            return attribute;
-        }
-
-        String[] stringValues;
-        for (Object value : values) {
-            if (!(value instanceof String)) {
-                continue;
-            }
-
-            stringValues = ((String) value).split(scopeDelimiter);
-            if (stringValues.length < 2) {
-                log.error("Input attribute value {} does not contain delimited {} and can not be split", value,
-                        scopeDelimiter);
-                throw new AttributeResolutionException("Input attribute value can not be split.");
-            }
-            attribute.getValues().add(new ScopedAttributeValue(stringValues[0], stringValues[1]));
-        }
-
-        return attribute;
-    }
-
-    /**
-     * Get delimiter between value and scope.
-     * 
-     * @return delimiter between value and scope
-     */
-    public String getScopeDelimited() {
-        return scopeDelimiter;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodDefinition.java.svn-base
deleted file mode 100644
index b625d14..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodDefinition.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Attribute definition that exposes the principals authentication method as an attribute.
- */
-public class PrincipalAuthenticationMethodDefinition extends BaseAttributeDefinition {
-
-    /** {@inheritDoc} */
-    protected BaseAttribute<String> doResolve(ShibbolethResolutionContext resolutionContext) {
-        BasicAttribute<String> attribute = new BasicAttribute<String>();
-        attribute.setId(getId());
-
-        String authnMethod = resolutionContext.getAttributeRequestContext().getPrincipalAuthenticationMethod();
-        if (!DatatypeHelper.isEmpty(authnMethod)) {
-            attribute.getValues().add(authnMethod);
-        }
-
-        return attribute;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrincipalNameDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrincipalNameDefinition.java.svn-base
deleted file mode 100644
index 644034b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/PrincipalNameDefinition.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Attribute definition that exposes the user's principal name as an attribute.
- */
-public class PrincipalNameDefinition extends BaseAttributeDefinition {
-
-    /** {@inheritDoc} */
-    protected BaseAttribute<String> doResolve(ShibbolethResolutionContext resolutionContext) {
-        BasicAttribute<String> attribute = new BasicAttribute<String>();
-        attribute.setId(getId());
-
-        String name = resolutionContext.getAttributeRequestContext().getPrincipalName();
-        if (!DatatypeHelper.isEmpty(name)) {
-            attribute.getValues().add(name);
-        }
-
-        return attribute;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinition.java.svn-base
deleted file mode 100644
index dc7cdc7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Collection;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/** An attribute definition that splits the source attribute's values by means of a regex. */
-public class RegexSplitAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(RegexSplitAttributeDefinition.class);
-
-    /** Regular expression used to split values. */
-    private Pattern regex;
-    
-    /**
-     * Constructor.
-     * 
-     * @param regularExpression expression used to split attribute values
-     * @param caseSensitive whether the regular expression is case sensitive
-     */
-    public RegexSplitAttributeDefinition(String regularExpression, boolean caseSensitive) {
-        if(!caseSensitive){
-            regex = Pattern.compile(regularExpression, Pattern.CASE_INSENSITIVE);
-        }else{
-            regex = Pattern.compile(regularExpression);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected BaseAttribute<?> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        BasicAttribute<Object> attribute = new BasicAttribute<Object>();
-        attribute.setId(getId());
-
-        Collection<?> values = getValuesFromAllDependencies(resolutionContext);
-        if (values == null || values.isEmpty()) {
-            return attribute;
-        }
-
-        Matcher matcher;
-        for (Object value : values) {
-            if (value instanceof String) {
-                matcher = regex.matcher((String) value);
-                if(matcher.matches()){
-                    attribute.getValues().add(matcher.group(1));
-                } else {
-                    log.debug("Value {} did not result in any values when split by regular expression {}", value, regex
-                            .toString());
-                }
-            } else {
-                log.debug("Ignoring non-string attribute value");
-            }
-        }
-
-        return attribute;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if(getSourceAttributeID() == null){
-            throw new AttributeResolutionException("Source attribute ID is required but none was given.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinition.java.svn-base
deleted file mode 100644
index 89a4fed..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Collection;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml1.core.NameIdentifier;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * An attribute definition the creates attributes whose values are {@link NameIdentifier}.
- * 
- * When building the NameIdentifier the textual content of the NameIdentifier is the value of the source attribute. If a
- * {@link #nameIdQualifier} is provided that value is used as the NameIdentifier's name qualifier otherwise the
- * attribute issuer's entity ID is used. The attribute requester's entity ID is always used as the NameIdentifier's SP
- * name qualifier.
- */
-public class SAML1NameIdentifierAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Builder of NameIdentifier XMLObjects. */
-    private final SAMLObjectBuilder<NameIdentifier> nameIdBuilder;
-
-    /** Format of the NameIdentifier. */
-    private String nameIdFormat;
-
-    /** Name qualifier for the NameIdentifier. */
-    private String nameIdQualifier;
-
-    /** Constructor. */
-    public SAML1NameIdentifierAttributeDefinition() {
-        super();
-        nameIdBuilder = (SAMLObjectBuilder<NameIdentifier>) Configuration.getBuilderFactory().getBuilder(
-                NameIdentifier.DEFAULT_ELEMENT_NAME);
-    }
-
-    /**
-     * Gets the format for the NameIdentifier used as an attribute value.
-     * 
-     * @return format for the NameIdentifier used as an attribute value
-     */
-    public String getNameIdFormat() {
-        return nameIdFormat;
-    }
-
-    /**
-     * Sets the format for the NameIdentifier used as an attribute value.
-     * 
-     * @param format format for the NameIdentifier used as an attribute value
-     */
-    public void setNameIdFormat(String format) {
-        nameIdFormat = format;
-    }
-
-    /**
-     * Gets the NameIdentifier qualifier for the NameIdentifier used as an attribute value.
-     * 
-     * @return NameIdentifier qualifier for the NameIdentifier used as an attribute value
-     */
-    public String getNameIdQualifier() {
-        return nameIdQualifier;
-    }
-
-    /**
-     * Sets the NameIdentifier qualifier for the NameIdentifier used as an attribute value.
-     * 
-     * @param qualifier NameIdentifier qualifier for the NameIdentifier used as an attribute value
-     */
-    public void setNameIdQualifier(String qualifier) {
-        nameIdQualifier = qualifier;
-    }
-
-    /** {@inheritDoc} */
-    protected BaseAttribute<?> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        BasicAttribute<NameIdentifier> attribute = new BasicAttribute<NameIdentifier>();
-        attribute.setId(getId());
-
-        Collection<?> values = getValuesFromAllDependencies(resolutionContext);
-        if (values != null && !values.isEmpty()) {
-            for (Object value : values) {
-                attribute.getValues().add(buildNameId(value.toString(), resolutionContext));
-            }
-        }
-
-        return attribute;
-    }
-
-    /**
-     * Builds a name ID. The provided value is the textual content of the NameIdentifier. If a {@link #nameIdQualifier}
-     * is not null it is used as the NameIdentifier's name qualifier, otherwise the attribute issuer's entity id is
-     * used.
-     * 
-     * @param nameIdValue value of the NameIdentifier
-     * @param resolutionContext current resolution context
-     * 
-     * @return the constructed NameIdentifier
-     */
-    protected NameIdentifier buildNameId(String nameIdValue, ShibbolethResolutionContext resolutionContext) {
-        NameIdentifier nameId = nameIdBuilder.buildObject();
-        nameId.setNameIdentifier(nameIdValue);
-
-        if (nameIdFormat != null) {
-            nameId.setFormat(nameIdFormat);
-        }
-
-        if (nameIdQualifier != null) {
-            nameId.setNameQualifier(nameIdQualifier);
-        } else {
-            nameId.setNameQualifier(resolutionContext.getAttributeRequestContext().getLocalEntityId());
-        }
-
-        return nameId;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinition.java.svn-base
deleted file mode 100644
index 6df6688..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Collection;
-
-import org.opensaml.Configuration;
-import org.opensaml.common.SAMLObjectBuilder;
-import org.opensaml.saml2.core.NameID;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * An attribute definition the creates attributes whose values are {@link NameID}.
- * 
- * When building the NameID the textual content of the NameID is the value of the source attribute. If a
- * {@link #nameIdQualifier} is provided that value is used as the NameID's name qualifier otherwise the attribute
- * issuer's entity ID is used. The attribute requester's entity ID is always used as the NameID's SP name qualifier.
- */
-public class SAML2NameIDAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Builder of NameID XMLObjects. */
-    private final SAMLObjectBuilder<NameID> nameIdBuilder;
-
-    /** Format of the NameID. */
-    private String nameIdFormat;
-
-    /** Name qualifier for the NameID. */
-    private String nameIdQualifier;
-
-    /** SP name qualifier for the NameID. */
-    private String nameIdSPQualifier;
-    
-    /** Constructor. */
-    public SAML2NameIDAttributeDefinition() {
-        super();
-        nameIdBuilder = (SAMLObjectBuilder<NameID>) Configuration.getBuilderFactory().getBuilder(
-                NameID.DEFAULT_ELEMENT_NAME);
-    }
-
-    /**
-     * Gets the format for the NameID used as an attribute value.
-     * 
-     * @return format for the NameID used as an attribute value
-     */
-    public String getNameIdFormat() {
-        return nameIdFormat;
-    }
-
-    /**
-     * Sets the format for the NameID used as an attribute value.
-     * 
-     * @param format format for the NameID used as an attribute value
-     */
-    public void setNameIdFormat(String format) {
-        nameIdFormat = format;
-    }
-
-    /**
-     * Gets the NameQualifier for the NameID used as an attribute value.
-     * 
-     * @return NameQualifier for the NameID used as an attribute value
-     */
-    public String getNameIdQualifier() {
-        return nameIdQualifier;
-    }
-
-    /**
-     * Sets the NameQualifier for the NameID used as an attribute value.
-     * 
-     * @param qualifier NameQualifier for the NameID used as an attribute value
-     */
-    public void setNameIdQualifier(String qualifier) {
-        nameIdQualifier = qualifier;
-    }
-
-    /**
-     * Gets the SPNameQualifier for the NameID used as an attribute value.
-     * 
-     * @return SPNameQualifier for the NameID used as an attribute value
-     */
-    public String getNameIdSPQualifier() {
-        return nameIdSPQualifier;
-    }
-
-    /**
-     * Sets the SPNameQualifier for the NameID used as an attribute value.
-     * 
-     * @param qualifier SPNameQualifier for the NameID used as an attribute value
-     */
-    public void setNameIdSPQualifier(String qualifier) {
-        nameIdSPQualifier = qualifier;
-    }
-    
-    /** {@inheritDoc} */
-    protected BaseAttribute<?> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        BasicAttribute<NameID> attribute = new BasicAttribute<NameID>();
-        attribute.setId(getId());
-
-        Collection<?> values = getValuesFromAllDependencies(resolutionContext);
-        if (values != null && !values.isEmpty()) {
-            for (Object value : values) {
-                attribute.getValues().add(buildNameId(value.toString(), resolutionContext));
-            }
-        }
-
-        return attribute;
-    }
-
-    /**
-     * Builds a name ID. The provided value is the textual content of the NameID. The
-     * NameQualifier and SPNameQualifier are set according to the configuration, or
-     * to the local and requesting entityIDs respectively. 
-     * 
-     * @param nameIdValue value of the NameID
-     * @param resolutionContext current resolution context
-     * 
-     * @return the constructed NameID
-     */
-    protected NameID buildNameId(String nameIdValue, ShibbolethResolutionContext resolutionContext) {
-        NameID nameId = nameIdBuilder.buildObject();
-        nameId.setValue(nameIdValue);
-
-        if (nameIdFormat != null) {
-            nameId.setFormat(nameIdFormat);
-        }
-
-        if (nameIdQualifier != null) {
-            nameId.setNameQualifier(nameIdQualifier);
-        } else {
-            nameId.setNameQualifier(resolutionContext.getAttributeRequestContext().getLocalEntityId());
-        }
-        
-        if (nameIdSPQualifier != null) {
-            nameId.setSPNameQualifier(nameIdSPQualifier);
-        } else {
-            nameId.setSPNameQualifier(resolutionContext.getAttributeRequestContext().getInboundMessageIssuer());
-        }
-
-        return nameId;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ScopedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ScopedAttributeDefinition.java.svn-base
deleted file mode 100644
index 9f760ef..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ScopedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Collection;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * An attribute definition that creates {@link ScopedAttributeValue}s by taking a source attribute value and applying a
- * static scope to each.
- */
-public class ScopedAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Scope value. */
-    private String scope;
-
-    /**
-     * Constructor.
-     * 
-     * @param newScope scope of the attribute
-     */
-    public ScopedAttributeDefinition(String newScope) {
-        this.scope = newScope;
-    }
-
-    /** {@inheritDoc} */
-    public BaseAttribute<ScopedAttributeValue> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        BasicAttribute<ScopedAttributeValue> attribute = new BasicAttribute<ScopedAttributeValue>();
-        attribute.setId(getId());
-
-        Collection<?> values = getValuesFromAllDependencies(resolutionContext);
-        if (values != null && !values.isEmpty()) {
-            for (Object value : values) {
-                if (value != null) {
-                    String strValue = DatatypeHelper.safeTrimOrNullString(value.toString());
-                    if (strValue != null) {
-                        attribute.getValues().add(new ScopedAttributeValue(strValue.toString(), scope));
-                    }
-                }
-            }
-        }
-
-        return attribute;
-    }
-
-    /**
-     * Get scope value.
-     * 
-     * @return Returns the scope.
-     */
-    public String getScope() {
-        return scope;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ScriptedAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ScriptedAttributeDefinition.java.svn-base
deleted file mode 100644
index ac24bdd..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ScriptedAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Map;
-
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import javax.script.SimpleScriptContext;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ResolutionPlugIn;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.DataConnector;
-
-/**
- * An attribute definition the computes the attribute definition by executing a script written in some JSR-223
- * supporting language.
- */
-public class ScriptedAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ScriptedAttributeDefinition.class);
-
-    /** The scripting language. */
-    private String scriptLanguage;
-
-    /** The script to execute. */
-    private String script;
-
-    /** The script engine to execute the script. */
-    private ScriptEngine scriptEngine;
-
-    /** The compiled form of the script, if the script engine supports compiling. */
-    private CompiledScript compiledScript;
-
-    /**
-     * Constructor.
-     * 
-     * @param language the scripting language that will be used
-     */
-    public ScriptedAttributeDefinition(String language) {
-        scriptLanguage = language;
-    }
-
-    /**
-     * Gets the scripting language used.
-     * 
-     * @return scripting language used
-     */
-    public String getScriptLanguage() {
-        return scriptLanguage;
-    }
-
-    /**
-     * Gets the script that will be executed.
-     * 
-     * @return script that will be executed
-     */
-    public String getScript() {
-        return script;
-    }
-
-    /**
-     * Sets the script that will be executed.
-     * 
-     * @param newScript script that will be executed
-     */
-    public void setScript(String newScript) {
-        script = newScript;
-        compileScript();
-    }
-
-    /** Initializes this attribute definition. */
-    public void initialize() {
-        ScriptEngineManager sem = new ScriptEngineManager();
-        scriptEngine = sem.getEngineByName(scriptLanguage);
-        compileScript();
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if (scriptEngine == null) {
-            log.error("ScriptletAttributeDefinition " + getId()
-                    + " unable to create scripting engine for the language: " + scriptLanguage);
-            throw new AttributeResolutionException("ScriptletAttributeDefinition " + getId()
-                    + " unable to create scripting engine for the language: " + scriptLanguage);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected BaseAttribute<?> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        ScriptContext context = getScriptContext(resolutionContext);
-
-        try {
-            if (compiledScript != null) {
-                compiledScript.eval(context);
-            } else {
-                scriptEngine.eval(script, context);
-            }
-
-            BaseAttribute attribute = (BaseAttribute) context.getAttribute(getId());
-            if (attribute == null) {
-                log.error("{} produced a null attribute", getId());
-                throw new AttributeResolutionException(getId() + " produced a null attributes");
-            }
-
-            return attribute;
-        } catch (ScriptException e) {
-            log.error("ScriptletAttributeDefinition " + getId() + " unable to execute script", e);
-            throw new AttributeResolutionException("ScriptletAttributeDefinition " + getId()
-                    + " unable to execute script", e);
-        }
-    }
-
-    /** Compiles the script if the scripting engine supports it. */
-    protected void compileScript() {
-        if (DatatypeHelper.isEmpty(script)) {
-            return;
-        }
-
-        try {
-            if (scriptEngine != null && scriptEngine instanceof Compilable) {
-                compiledScript = ((Compilable) scriptEngine).compile(script);
-            }
-        } catch (ScriptException e) {
-            compiledScript = null;
-            log.warn("{} unable to compile even though the scripting engine supports this functionality.", getId());
-        }
-    }
-
-    /**
-     * Creates the script execution context from the resolution context.
-     * 
-     * @param resolutionContext current resolution context
-     * 
-     * @return constructed script context
-     * 
-     * @throws AttributeResolutionException thrown if dependent data connectors or attribute definitions can not be
-     *             resolved
-     */
-    protected ScriptContext getScriptContext(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        SimpleScriptContext scriptContext = new SimpleScriptContext();
-        scriptContext.setAttribute(getId(), null, ScriptContext.ENGINE_SCOPE);
-
-        scriptContext.setAttribute("requestContext", resolutionContext.getAttributeRequestContext(),
-                ScriptContext.ENGINE_SCOPE);
-
-        ResolutionPlugIn plugin;
-        Map<String, BaseAttribute> attributes;
-        BaseAttribute attribute;
-
-        if (!getDependencyIds().isEmpty()) {
-            for (String dependency : getDependencyIds()) {
-                plugin = resolutionContext.getResolvedPlugins().get(dependency);
-                if (plugin instanceof DataConnector) {
-                    attributes = ((DataConnector) plugin).resolve(resolutionContext);
-                    if (attributes != null) {
-                        for (BaseAttribute attr : attributes.values()) {
-                            scriptContext.setAttribute(attr.getId(), attr, ScriptContext.ENGINE_SCOPE);
-                        }
-                    }
-                } else if (plugin instanceof AttributeDefinition) {
-                    attribute = ((AttributeDefinition) plugin).resolve(resolutionContext);
-                    if (attribute != null) {
-                        scriptContext.setAttribute(attribute.getId(), attribute, ScriptContext.ENGINE_SCOPE);
-                    }
-                }
-            }
-        }
-
-        return scriptContext;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SimpleAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SimpleAttributeDefinition.java.svn-base
deleted file mode 100644
index 3d1fcb4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/SimpleAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Collection;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Simple attribute definition.
- */
-public class SimpleAttributeDefinition extends BaseAttributeDefinition {
-
-    /** {@inheritDoc} */
-    protected BaseAttribute<?> doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        BasicAttribute<Object> attribute = new BasicAttribute<Object>();
-        attribute.setId(getId());
-
-        Collection<?> values = getValuesFromAllDependencies(resolutionContext);
-        if (values != null && !values.isEmpty()) {
-            for (Object value : values) {
-                attribute.getValues().add(value);
-            }
-        }
-
-        return attribute;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TemplateAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TemplateAttributeDefinition.java.svn-base
deleted file mode 100644
index 282b582..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TemplateAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.resource.util.StringResourceRepository;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.util.StringResourceLoader;
-import edu.internet2.middleware.shibboleth.common.util.VelocityStringResourceRepositoryAdaptor;
-
-/**
- * An {@link AttributeDefinition} that constructs its values based on the values of its dependencies using the Velocity
- * Template Language. Dependencies may have multiple values, however multiples dependencies must have the same number of
- * values. In the case of multi-valued dependencies, the template will be evaluated multiples times, iterating over each
- * dependency.
- */
-public class TemplateAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(TemplateAttributeDefinition.class);
-
-    /** Velocity engine to use to render attribute values. */
-    private final VelocityEngine velocity;
-
-    /** Name the attribute template is registered under within the template engine. */
-    private String templateName;
-
-    /** Template that produces the attribute value. */
-    private String attributeTemplate;
-
-    /**
-     * IDs of the attributes used in this composite.
-     */
-    private List<String> sourceAttributes;
-
-    /**
-     * Constructor.
-     * 
-     * @param newVelocityEngine velocity engine used to parse template.
-     */
-    public TemplateAttributeDefinition(VelocityEngine newVelocityEngine) {
-        velocity = newVelocityEngine;
-        sourceAttributes = new ArrayList<String>();
-    }
-
-    /** {@inheritDoc} */
-    protected BaseAttribute doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        Map<String, Iterator> sourceValues = new HashMap<String, Iterator>();
-        BasicAttribute<Object> attribute = new BasicAttribute<Object>();
-        attribute.setId(getId());
-
-        int valueCount = -1;
-
-        // get source attributes values
-        for (String attributeId : sourceAttributes) {
-            Collection values = getValuesFromAllDependencies(resolutionContext, attributeId);
-
-            if (valueCount == -1) {
-                valueCount = values.size();
-            } else if (valueCount != values.size()) {
-                log.error("All attributes used in TemplateAttributeDefinition " + getId()
-                        + " must have the same number of values.");
-                throw new AttributeResolutionException("All attributes used in TemplateAttributeDefinition " + getId()
-                        + " must have the same number of values.");
-            }
-
-            sourceValues.put(attributeId, values.iterator());
-        }
-
-        // build velocity context
-        VelocityContext vCtx = new VelocityContext();
-        vCtx.put("requestContext", resolutionContext.getAttributeRequestContext());
-        for (int i = 0; i < valueCount; i++) {
-            for (String attributeId : sourceValues.keySet()) {
-                vCtx.put(attributeId, sourceValues.get(attributeId).next());
-            }
-
-            try {
-                log.debug("Populating the following {} template", templateName);
-
-                StringWriter output = new StringWriter();
-                Template template = velocity.getTemplate(templateName);
-                template.merge(vCtx, output);
-                attribute.getValues().add(output.toString());
-            } catch (Exception e) {
-                log.error("Unable to populate " + templateName + " template", e);
-                throw new AttributeResolutionException("Unable to evaluate template", e);
-            }
-        }
-
-        return attribute;
-    }
-
-    /**
-     * Initialize the attribute definition and prepare it for use.
-     * 
-     * @throws Exception if unable to initialize attribute definition
-     */
-    public void initialize() throws Exception {
-        if (DatatypeHelper.isEmpty(attributeTemplate)) {
-            StringBuffer defaultTemplate = new StringBuffer();
-            for (String id : sourceAttributes) {
-                defaultTemplate.append("${").append(id).append("} ");
-            }
-            attributeTemplate = defaultTemplate.toString();
-        }
-
-        registerTemplate();
-    }
-
-    /**
-     * Registers the template with template engine.
-     */
-    protected void registerTemplate() {
-        try {
-            StringResourceRepository repository = VelocityStringResourceRepositoryAdaptor.getRepository(velocity);
-            templateName = "shibboleth.resolver.ad." + getId();
-            repository.putStringResource(templateName, attributeTemplate.trim());
-        } catch (VelocityException e) {
-            log.error("Unable to register template into Velocity string repository", e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // do nothing
-    }
-
-    /**
-     * Get the attribute template.
-     * 
-     * @return the attribute template
-     */
-    public String getAttributeTemplate() {
-        return attributeTemplate;
-    }
-
-    /**
-     * Set the attribute template.
-     * 
-     * @param newAttributeTemplate the attribute template
-     */
-    public void setAttributeTemplate(String newAttributeTemplate) {
-        attributeTemplate = newAttributeTemplate;
-    }
-
-    /**
-     * Get the source attribute IDs.
-     * 
-     * @return the source attribute IDs
-     */
-    public List<String> getSourceAttributes() {
-        return sourceAttributes;
-    }
-
-    /**
-     * Set the source attribute IDs.
-     * 
-     * @param newSourceAttributes the source attribute IDs
-     */
-    public void setSourceAttributes(List<String> newSourceAttributes) {
-        sourceAttributes = newSourceAttributes;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TransientIdAttributeDefinition.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TransientIdAttributeDefinition.java.svn-base
deleted file mode 100644
index 45f9888..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TransientIdAttributeDefinition.java.svn-base
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.security.NoSuchAlgorithmException;
-
-import org.opensaml.common.IdentifierGenerator;
-import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
-import org.opensaml.util.storage.StorageService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-
-/**
- * An attribute definition that generates random identifiers useful for transient subject IDs.
- * 
- * Information about the created IDs are stored within a provided {@link StorageService} in the form of
- * {@link TransientIdEntry}s. Each entry is mapped under two keys; the generated ID and a key derived from the tuple
- * (outbound message issuer, inbound message issuer, principal name).
- */
-public class TransientIdAttributeDefinition extends BaseAttributeDefinition {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(TransientIdAttributeDefinition.class);
-
-    /** Store used to map tokens to principals. */
-    private StorageService<String, TransientIdEntry> idStore;
-
-    /** Storage partition in which IDs are stored. */
-    private String partition;
-
-    /** Generator of random, hex-encoded, tokens. */
-    private IdentifierGenerator idGenerator;
-
-    /** Size, in bytes, of the token. */
-    private int idSize;
-
-    /** Length, in milliseconds, tokens are valid. */
-    private long idLifetime;
-
-    /**
-     * Constructor.
-     * 
-     * @param store store used to map tokens to principals
-     * 
-     * @throws NoSuchAlgorithmException thrown if the SHA1PRNG, used as the default random number generation algorithm,
-     *             is not supported
-     */
-    public TransientIdAttributeDefinition(StorageService<String, TransientIdEntry> store)
-            throws NoSuchAlgorithmException {
-        idGenerator = new SecureRandomIdentifierGenerator();
-        idStore = store;
-        partition = "transientId";
-        idSize = 16;
-        idLifetime = 1000 * 60 * 60 * 4;
-
-        // Prime the generator
-        idGenerator.generateIdentifier(idSize);
-    }
-
-    /** {@inheritDoc} */
-    protected BaseAttribute doResolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        
-        BasicAttribute<String> attribute = new BasicAttribute<String>();
-        attribute.setId(getId());
-
-        SAMLProfileRequestContext requestContext = resolutionContext.getAttributeRequestContext();
-
-        String principalName = requestContext.getPrincipalName();
-        if (principalName == null) {
-            log.debug("Principal name for request {} was null, no attribute returned",
-                    requestContext.getInboundSAMLMessageId());
-            return attribute;
-        }
-
-        log.debug(
-                "Building transient ID for request {}; outbound message issuer: {}, inbound message issuer: {}, principal identifer: {}",
-                new Object[] { requestContext.getInboundSAMLMessageId(), requestContext.getOutboundMessageIssuer(),
-                        requestContext.getInboundMessageIssuer(), principalName, });
-        StringBuilder principalTokenIdBuilder = new StringBuilder();
-        principalTokenIdBuilder.append(requestContext.getOutboundMessageIssuer()).append("!")
-                .append(requestContext.getInboundMessageIssuer()).append("!").append(principalName);
-        String principalTokenId = principalTokenIdBuilder.toString();
-
-        TransientIdEntry tokenEntry = idStore.get(partition, principalTokenId);
-        if (tokenEntry == null || tokenEntry.isExpired()) {
-            String token = idGenerator.generateIdentifier(idSize);
-            tokenEntry = new TransientIdEntry(idLifetime, requestContext.getInboundMessageIssuer(), principalName,
-                    token);
-            idStore.put(partition, token, tokenEntry);
-            idStore.put(partition, principalTokenId, tokenEntry);
-        }
-
-        log.debug("Created transient ID {} for request {}", tokenEntry.getId(),
-                requestContext.getInboundSAMLMessageId());
-        attribute.getValues().add(tokenEntry.getId());
-
-        return attribute;
-    }
-
-    /**
-     * Gets the size, in bytes, of the id.
-     * 
-     * @return size, in bytes, of the id
-     */
-    public int getIdSize() {
-        return idSize;
-    }
-
-    /**
-     * Sets the size, in bytes, of the id.
-     * 
-     * @param size size, in bytes, of the id
-     */
-    public void setIdSize(int size) {
-        idSize = size;
-    }
-
-    /**
-     * Gets the time, in milliseconds, ids are valid.
-     * 
-     * @return time, in milliseconds, ids are valid
-     */
-    public long getIdLifetime() {
-        return idLifetime;
-    }
-
-    /**
-     * Sets the time, in milliseconds, ids are valid.
-     * 
-     * @param lifetime time, in milliseconds, ids are valid
-     */
-    public void setTokenLiftetime(long lifetime) {
-        idLifetime = lifetime;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TransientIdEntry.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TransientIdEntry.java.svn-base
deleted file mode 100644
index f66611c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/TransientIdEntry.java.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import org.joda.time.DateTime;
-import org.opensaml.util.storage.AbstractExpiringObject;
-
-/** Storage service entry used to store information associated with a transient ID. */
-public class TransientIdEntry extends AbstractExpiringObject {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3594553144206354129L;
-
-    /** Relying party the token was issued to. */
-    private String relyingPartyId;
-
-    /** Principal for which the token was issued. */
-    private String principalName;
-
-    /** Transient id. */
-    private String id;
-
-    /**
-     * Constructor.
-     * 
-     * @param lifetime lifetime of the token in milliseconds
-     * @param relyingParty relying party the token was issued to
-     * @param principal principal the token was issued for
-     * @param randomId the random ID token
-     */
-    public TransientIdEntry(long lifetime, String relyingParty, String principal, String randomId) {
-        super(new DateTime().plus(lifetime));
-        relyingPartyId = relyingParty;
-        principalName = principal;
-        id = randomId;
-    }
-
-    /**
-     * Gets the principal the token was issued for.
-     * 
-     * @return principal the token was issued for
-     */
-    public String getPrincipalName() {
-        return principalName;
-    }
-
-    /**
-     * Gets the relying party the token was issued to.
-     * 
-     * @return relying party the token was issued to
-     */
-    public String getRelyingPartyId() {
-        return relyingPartyId;
-    }
-
-    /**
-     * Gets the ID.
-     * 
-     * @return ID
-     */
-    public String getId() {
-        return id;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ValueMap.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ValueMap.java.svn-base
deleted file mode 100644
index cbd16ba..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/ValueMap.java.svn-base
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Performs many to one mapping of source values to a return value. SourceValue strings may include regular expressions
- * and the ReturnValue may include back references to capturing groups as supported by {@link java.util.regex.Pattern}.
- */
-public class ValueMap {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ValueMap.class);
-
-    /** Return value. */
-    private String returnValue;
-
-    /** Source values. */
-    private Collection<SourceValue> sourceValues;
-
-    /** Constructor. */
-    public ValueMap() {
-        sourceValues = new HashSet<SourceValue>();
-    }
-
-    /**
-     * Gets the return value.
-     * 
-     * @return the return value
-     */
-    public String getReturnValue() {
-        return returnValue;
-    }
-
-    /**
-     * Sets the return value.
-     * 
-     * @param newReturnValue the return value
-     */
-    public void setReturnValue(String newReturnValue) {
-        returnValue = newReturnValue;
-    }
-
-    /**
-     * Gets the collection of source values.
-     * 
-     * @return the collection of source values
-     */
-    public Collection<SourceValue> getSourceValues() {
-        return sourceValues;
-    }
-
-    /**
-     * Evaluate an incoming attribute value against this value map.
-     * 
-     * @param attributeValue incoming attribute value
-     * @return set of new values the incoming value mapped to
-     */
-    public Set<String> evaluate(String attributeValue) {
-        log.debug("Attempting to map attribute value '{}'", attributeValue);
-        Set<String> mappedValues = new HashSet<String>();
-        Matcher m;
-
-        String newValue;
-        for (SourceValue sourceValue : sourceValues) {
-            newValue = null;
-            if (sourceValue.isPartialMatch()) {
-                log.debug("Performing partial match comparison.");
-                if (attributeValue.contains(sourceValue.getValue())) {
-                    log.debug("Attribute value '{}' matches source value '{}' it will be mapped to '{}'", new Object[] {
-                            attributeValue, sourceValue.getValue(), newValue });
-                    newValue = returnValue;
-                }
-            } else {
-                log.debug("Performing regular expression based comparison");
-                try {
-                    int flags = sourceValue.isIgnoreCase() ? Pattern.CASE_INSENSITIVE : 0;
-                    m = Pattern.compile(sourceValue.getValue(), flags).matcher(attributeValue);
-                    if (m.matches()) {
-                        newValue = m.replaceAll(returnValue);
-                        log.debug("Attribute value '{}' matches regular expression it will be mapped to '{}'",
-                                attributeValue, newValue);
-                    }
-                } catch (PatternSyntaxException e) {
-                    log.debug("Error matching value {}.  Skipping this value.", attributeValue);
-                }
-            }
-
-            if (newValue != null) {
-                mappedValues.add(newValue);
-            }
-        }
-
-        return mappedValues;
-    }
-
-    /**
-     * Represents incoming attribute values and rules used for matching them. The value may include regular expressions.
-     */
-    public class SourceValue {
-
-        /**
-         * Value string. This may contain regular expressions.
-         */
-        private String value;
-
-        /**
-         * Whether case should be ignored when matching.
-         */
-        private boolean ignoreCase;
-
-        /**
-         * Whether partial matches should be allowed.
-         */
-        private boolean partialMatch;
-
-        /**
-         * Constructor.
-         * 
-         * @param newValue value string
-         * @param newIgnoreCase whether case should be ignored when matching
-         * @param newPartialMatch whether partial matches should be allowed
-         */
-        public SourceValue(String newValue, boolean newIgnoreCase, boolean newPartialMatch) {
-            value = newValue;
-            ignoreCase = newIgnoreCase;
-            partialMatch = newPartialMatch;
-        }
-
-        /**
-         * Gets whether case should be ignored when matching.
-         * 
-         * @return whether case should be ignored when matching
-         */
-        public boolean isIgnoreCase() {
-            return ignoreCase;
-        }
-
-        /**
-         * Gets whether partial matches should be allowed.
-         * 
-         * @return whether partial matches should be allowed
-         */
-        public boolean isPartialMatch() {
-            return partialMatch;
-        }
-
-        /**
-         * Gets the value string.
-         * 
-         * @return the value string.
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /** {@inheritDoc} */
-        public String toString() {
-            return getValue();
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/all-wcprops
deleted file mode 100644
index ed1a049..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/all-wcprops
+++ /dev/null
@@ -1,89 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 145
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector
-END
-LdapPoolVTStrategy.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/1015/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolVTStrategy.java
-END
-StoredIDStore.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StoredIDStore.java
-END
-ContextualDataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 173
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/ContextualDataConnector.java
-END
-LdapPoolEmptyStrategy.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/1015/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolEmptyStrategy.java
-END
-RDBMSDataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/RDBMSDataConnector.java
-END
-StaticDataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StaticDataConnector.java
-END
-LdapPoolStrategy.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/1015/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapPoolStrategy.java
-END
-BaseDataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/BaseDataConnector.java
-END
-TemplateEngine.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/TemplateEngine.java
-END
-ComputedIDDataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/ComputedIDDataConnector.java
-END
-StoredIDDataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/StoredIDDataConnector.java
-END
-DataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/DataConnector.java
-END
-RDBMSColumnDescriptor.java
-K 25
-svn:wc:ra_dav:version-url
-V 171
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/RDBMSColumnDescriptor.java
-END
-LdapDataConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/1015/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/LdapDataConnector.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/entries
deleted file mode 100644
index dd8078d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/entries
+++ /dev/null
@@ -1,504 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-StoredIDStore.java
-file
-
-
-
-
-2014-02-19T17:27:41.418752Z
-308e5a91bfbab2f7ae3b3bb5ba4ed70e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-28515
-

-ContextualDataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.418752Z
-2f77f68d738c9f7ec0e3d7e5322218a7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2866
-

-LdapPoolEmptyStrategy.java
-file
-
-
-
-
-2014-02-19T17:27:41.418752Z
-b239001fb56193db20ea416af5c93e35
-2012-02-23T15:10:40.444004Z
-1015
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3395
-

-RDBMSDataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.422752Z
-73299eefd630d1daea3be7d8af300b45
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-18788
-

-StaticDataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.422752Z
-70cad6730ab01587468783acc12c8516
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2330
-

-LdapPoolStrategy.java
-file
-
-
-
-
-2014-02-19T17:27:41.422752Z
-95ea1e4efe722f81d55379d19b5c9df7
-2012-02-23T15:10:40.444004Z
-1015
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2217
-

-BaseDataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.414752Z
-957a576baf49a0ad4f1201e513e7b0cc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1889
-

-TemplateEngine.java
-file
-
-
-
-
-2014-02-19T17:27:41.414752Z
-c675e8456fc55ba1e42ec40a7285b210
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8461
-

-ComputedIDDataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.414752Z
-0d114ae1f9e0ea61bc944030fd405e01
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6646
-

-StoredIDDataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.414752Z
-d872d0cf0e56da5e6566b756ced02fe9
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-15957
-

-DataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.418752Z
-87f9c738473b6dbd486e8a4c3f1bd5f9
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1612
-

-RDBMSColumnDescriptor.java
-file
-
-
-
-
-2014-02-19T17:27:41.418752Z
-35a00c7c3d18d211eac84d30b0b2dcd7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2688
-

-LdapDataConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.418752Z
-f330f8e19e4bfcef6b0e07d59d19f805
-2012-02-23T15:10:40.444004Z
-1015
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-17899
-

-LdapPoolVTStrategy.java
-file
-
-
-
-
-2014-02-19T17:27:41.418752Z
-d8fa380ae9a1e2bfb0598ccb994b2c06
-2012-02-23T15:10:40.444004Z
-1015
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3983
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/BaseDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/BaseDataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/BaseDataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/ComputedIDDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/ComputedIDDataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/ComputedIDDataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/ContextualDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/ContextualDataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/ContextualDataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/DataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/DataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/DataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapDataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapDataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolEmptyStrategy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolEmptyStrategy.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolEmptyStrategy.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolStrategy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolStrategy.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolStrategy.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolVTStrategy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolVTStrategy.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/LdapPoolVTStrategy.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/RDBMSColumnDescriptor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/RDBMSColumnDescriptor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/RDBMSColumnDescriptor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/RDBMSDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/RDBMSDataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/RDBMSDataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StaticDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StaticDataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StaticDataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StoredIDDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StoredIDDataConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StoredIDDataConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StoredIDStore.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StoredIDStore.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/StoredIDStore.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/TemplateEngine.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/TemplateEngine.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/prop-base/TemplateEngine.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/BaseDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/BaseDataConnector.java.svn-base
deleted file mode 100644
index c477fdb..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/BaseDataConnector.java.svn-base
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.AbstractResolutionPlugIn;
-
-/**
- * Base class for {@link DataConnector} plug-ins.
- */
-public abstract class BaseDataConnector extends AbstractResolutionPlugIn<Map<String, BaseAttribute>> implements
-        DataConnector {
-
-    /** ID of the data connector to use if this one fails. */
-    private String failoverDependencyId;
-    
-    /** Constructor. */
-    public BaseDataConnector(){
-        super();
-    }
-
-    /** {@inheritDoc} */
-    public String getFailoverDependencyId() {
-        return failoverDependencyId;
-    }
-
-    /**
-     * Set the ID of data connectors to use if this one fails.
-     * 
-     * @param id ID of data connectors to use if this one fails
-     */
-    public void setFailoverDependencyIds(String id) {
-        failoverDependencyId = id;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/ComputedIDDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/ComputedIDDataConnector.java.svn-base
deleted file mode 100644
index b0a8984..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/ComputedIDDataConnector.java.svn-base
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-import org.opensaml.xml.util.Base64;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.LazyMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * A data connector that generates a unique ID by computing the SHA-1 hash of a given attribute value, the entity ID of
- * the inbound message issuer, and a provided salt.
- *
- */
-public class ComputedIDDataConnector extends BaseDataConnector {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ComputedIDDataConnector.class);
-
-    /** ID of the attribute generated by this data connector. */
-    private String generatedAttribute;
-
-    /** ID of the attribute whose first value is used when generating the computed ID. */
-    private String sourceAttribute;
-
-    /** Salt used when computing the ID. */
-    private byte[] salt;
-
-    /**
-     * Constructor.
-     * 
-     * @param generatedAttributeId ID of the attribute generated by this data connector
-     * @param sourceAttributeId ID of the attribute whose first value is used when generating the computed ID
-     * @param idSalt salt used when computing the ID
-     */
-    public ComputedIDDataConnector(String generatedAttributeId, String sourceAttributeId, byte[] idSalt) {
-        log.warn("This data connector is deprecated.  The StoredID data connector should be used in its place.");
-
-        if (DatatypeHelper.isEmpty(generatedAttributeId)) {
-            throw new IllegalArgumentException("Provided generated attribute ID must not be empty");
-        }
-        generatedAttribute = generatedAttributeId;
-
-        if (DatatypeHelper.isEmpty(sourceAttributeId)) {
-            throw new IllegalArgumentException("Provided source attribute ID must not be empty");
-        }
-        sourceAttribute = sourceAttributeId;
-
-        if (idSalt.length < 16) {
-            throw new IllegalArgumentException("Provided salt must be at least 16 bytes in size.");
-        }
-        salt = idSalt;
-    }
-
-    /**
-     * Gets the salt used when computing the ID.
-     * 
-     * @return salt used when computing the ID
-     */
-    public byte[] getSalt() {
-        return salt;
-    }
-
-    /**
-     * Gets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @return ID of the attribute whose first value is used when generating the computed ID
-     */
-    public String getSourceAttributeId() {
-        return sourceAttribute;
-    }
-
-    /**
-     * Gets the ID of the attribute generated by this connector.
-     * 
-     * @return ID of the attribute generated by this connector
-     */
-    public String getGeneratedAttributeId() {
-        return generatedAttribute;
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> resolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-
-        String inboundMessageIssuer = resolutionContext.getAttributeRequestContext().getInboundMessageIssuer();
-        if (inboundMessageIssuer == null) {
-            log.debug("No inbound message issuer identified, unable to compute ID");
-            throw new AttributeResolutionException("No inbound message issuer identified");
-        }
-
-        Collection<Object> sourceIdValues = getValuesFromAllDependencies(resolutionContext, getSourceAttributeId());
-        if (sourceIdValues == null || sourceIdValues.isEmpty()) {
-            log.debug("Source attribute {} for connector {} provide no values", getSourceAttributeId(), getId());
-            return Collections.EMPTY_MAP;
-        }
-
-        if (sourceIdValues.size() > 1) {
-            log.warn("Source attribute {} for connector {} has more than one value, only the first value is used",
-                    getSourceAttributeId(), getId());
-        }
-        String sourceId = sourceIdValues.iterator().next().toString();
-
-        BasicAttribute<String> computedIdAttrib = new BasicAttribute<String>();
-        computedIdAttrib.setId(getGeneratedAttributeId());
-
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA");
-            md.update(inboundMessageIssuer.getBytes());
-            md.update((byte) '!');
-            md.update(sourceId.getBytes());
-            md.update((byte) '!');
-
-            computedIdAttrib.getValues().add(Base64.encodeBytes(md.digest(salt)));
-
-            LazyMap<String, BaseAttribute> attribtues = new LazyMap<String, BaseAttribute>();
-            attribtues.put(getGeneratedAttributeId(), computedIdAttrib);
-            return attribtues;
-        } catch (NoSuchAlgorithmException e) {
-            log.error("JVM error, SHA-1 hash is not supported.");
-            throw new AttributeResolutionException("SHA-1A is not supported, unable to compute ID");
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if (getDependencyIds() == null || getDependencyIds().size() != 1) {
-            log.error("Computed ID " + getId() + " data connectore requires exactly one dependency");
-            throw new AttributeResolutionException("Computed ID " + getId()
-                    + " data connectore requires exactly one dependency");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/ContextualDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/ContextualDataConnector.java.svn-base
deleted file mode 100644
index ddce6b7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/ContextualDataConnector.java.svn-base
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.util.List;
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Wrapper for a {@link DataConnector} within a resolution context. This wrapper ensures that the connector is resolved
- * only once per context.
- */
-public class ContextualDataConnector implements DataConnector {
-
-    /** Wrapped data connector. */
-    private DataConnector connector;
-
-    /** Cached result of resolving the data connector. */
-    private Map<String, BaseAttribute> attributes;
-
-    /**
-     * Constructor.
-     * 
-     * @param newConnector data connector to wrap
-     */
-    public ContextualDataConnector(DataConnector newConnector) {
-        this.connector = newConnector;
-    }
-
-    /** {@inheritDoc} */
-    public boolean equals(Object obj) {
-        return connector.equals(obj);
-    }
-
-    /** {@inheritDoc} */
-    public int hashCode() {
-        return connector.hashCode();
-    }
-
-    /** {@inheritDoc} */
-    public List<String> getDependencyIds() {
-        return connector.getDependencyIds();
-    }
-
-    /** {@inheritDoc} */
-    public String getFailoverDependencyId() {
-        return connector.getFailoverDependencyId();
-    }
-
-    /** {@inheritDoc} */
-    public String getId() {
-        return connector.getId();
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> resolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        if (attributes == null) {
-            attributes = connector.resolve(resolutionContext);
-        }
-
-        return attributes;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        connector.validate();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/DataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/DataConnector.java.svn-base
deleted file mode 100644
index ee7114d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/DataConnector.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ResolutionPlugIn;
-
-/**
- * A plugin used to pull attribute information from a data store.
- * 
- * Data connectors must be stateless and thread-safe as a single instance may be used to service every request.
- */
-public interface DataConnector extends ResolutionPlugIn<Map<String, BaseAttribute>> {
-
-    /**
-     * Returns the ID of data connectors to use if this one fails.
-     * 
-     * @return ID of data connectors to use if this one fails
-     */
-    public String getFailoverDependencyId();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapDataConnector.java.svn-base
deleted file mode 100644
index 9778098..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapDataConnector.java.svn-base
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.naming.NamingException;
-import javax.naming.directory.SearchResult;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.TemplateEngine.CharacterEscapingStrategy;
-import edu.vt.middleware.ldap.Ldap;
-import edu.vt.middleware.ldap.SearchFilter;
-import edu.vt.middleware.ldap.bean.LdapAttribute;
-import edu.vt.middleware.ldap.bean.LdapAttributes;
-import edu.vt.middleware.ldap.bean.LdapBeanProvider;
-
-/**
- * <code>LdapDataConnector</code> provides a plugin to retrieve attributes from an LDAP.
- */
-public class LdapDataConnector extends BaseDataConnector {
-
-    /** Authentication type values. */
-    public static enum AUTHENTICATION_TYPE {
-        /** Anonymous authentication type. */
-        ANONYMOUS("none"),
-        /** Simple authentication type. */
-        SIMPLE("simple"),
-        /** Strong authentication type. */
-        STRONG("strong"),
-        /** External authentication type. */
-        EXTERNAL("EXTERNAL"),
-        /** Digest MD5 authentication type. */
-        DIGEST_MD5("DIGEST-MD5"),
-        /** Cram MD5 authentication type. */
-        CRAM_MD5("CRAM-MD5"),
-        /** Kerberos authentication type. */
-        GSSAPI("GSSAPI");
-
-        /** auth type name passed to LdapConfig. */
-        private String authTypeName;
-
-        /**
-         * Default constructor.
-         * 
-         * @param s auth type name
-         */
-        private AUTHENTICATION_TYPE(String s) {
-            authTypeName = s;
-        }
-
-        /**
-         * This returns the auth type name needed by the LdapConfig.
-         * 
-         * @return auth type name
-         */
-        public String getAuthTypeName() {
-            return authTypeName;
-        }
-
-        /**
-         * Returns the corresponding AUTHENTICATION_TYPE for the supplied auth type name.
-         * 
-         * @param s auth type name to lookup
-         * @return AUTHENTICATION_TYPE
-         */
-        public static AUTHENTICATION_TYPE getAuthenticationTypeByName(String s) {
-            AUTHENTICATION_TYPE type = null;
-            if (AUTHENTICATION_TYPE.ANONYMOUS.getAuthTypeName().equals(s)) {
-                type = AUTHENTICATION_TYPE.ANONYMOUS;
-            } else if (AUTHENTICATION_TYPE.SIMPLE.getAuthTypeName().equals(s)) {
-                type = AUTHENTICATION_TYPE.SIMPLE;
-            } else if (AUTHENTICATION_TYPE.STRONG.getAuthTypeName().equals(s)) {
-                type = AUTHENTICATION_TYPE.STRONG;
-            } else if (AUTHENTICATION_TYPE.EXTERNAL.getAuthTypeName().equals(s)) {
-                type = AUTHENTICATION_TYPE.EXTERNAL;
-            } else if (AUTHENTICATION_TYPE.DIGEST_MD5.getAuthTypeName().equals(s)) {
-                type = AUTHENTICATION_TYPE.DIGEST_MD5;
-            } else if (AUTHENTICATION_TYPE.CRAM_MD5.getAuthTypeName().equals(s)) {
-                type = AUTHENTICATION_TYPE.CRAM_MD5;
-            } else if (AUTHENTICATION_TYPE.GSSAPI.getAuthTypeName().equals(s)) {
-                type = AUTHENTICATION_TYPE.GSSAPI;
-            }
-            return type;
-        }
-    };
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(LdapDataConnector.class);
-
-    /** Ldap pool strategy. */
-    private LdapPoolStrategy ldapPool;
-
-    /** Template engine used to change filter template into actual filter. */
-    private TemplateEngine filterCreator;
-
-    /** Name the filter template is registered under within the template engine. */
-    private String filterTemplateName;
-
-    /** Template that produces the query to use. */
-    private String filterTemplate;
-
-    /** Attributes to return from ldap searches. */
-    private String[] returnAttributes;
-
-    /** Whether an empty result set is an error. */
-    private boolean noResultsIsError;
-    
-    /** Cache of past search results. */
-    private Cache resultsCache;
-
-    /** Filter value escaping strategy. */
-    private final LDAPValueEscapingStrategy escapingStrategy;
-
-    /**
-     * This creates a new LDAP data connector with the supplied properties.
-     * 
-     * @param pool LDAP connection pooling strategy
-     * @param cache cached used to cache search results, or null if results should not be cached
-     */
-    public LdapDataConnector(LdapPoolStrategy pool, Cache cache) {
-        super();
-        ldapPool = pool;
-
-        resultsCache = cache;
-
-        escapingStrategy = new LDAPValueEscapingStrategy();
-    }
-
-    /**
-     * This sets the underlying template engine and registers the supplied template.
-     * 
-     * @param engine engine used to fill in search filter templates
-     * @param template search filter template
-     */
-    public void registerTemplate(TemplateEngine engine, String template) {
-        if (getId() == null) {
-            throw new IllegalStateException("Template cannot be registered until plugin id has been set");
-        }
-        filterCreator = engine;
-        filterTemplate = template;
-        filterTemplateName = "shibboleth.resolver.dc." + getId();
-        filterCreator.registerTemplate(filterTemplateName, filterTemplate);        
-    }
-
-    /** Removes all entries from the cache if results are being cached. */
-    protected void clearCache() {
-        if (isCacheResults()) {
-            resultsCache.removeAll();
-        }
-    }
-
-    /**
-     * This returns whether this connector will cache search results.
-     * 
-     * @return true if results are being cached
-     */
-    public boolean isCacheResults() {
-        return resultsCache != null;
-    }
-
-    /**
-     * This returns whether this connector will throw an exception if no search results are found.
-     * 
-     * @return true if searches which return no results are considered an error
-     */
-    public boolean isNoResultsIsError() {
-        return noResultsIsError;
-    }
-
-    /**
-     * This sets whether this connector will throw an exception if no search results are found.
-     * 
-     * @param isError true if searches which return no results are considered an error, false otherwise
-     */
-    public void setNoResultsIsError(boolean isError) {
-        noResultsIsError = isError;
-    }
-    
-    /**
-     * Gets the engine used to evaluate the query template.
-     * 
-     * @return engine used to evaluate the query template
-     */
-    public TemplateEngine getTemplateEngine() {
-        return filterCreator;
-    }
-
-    /**
-     * Gets the template used to create queries.
-     * 
-     * @return template used to create queries
-     */
-    public String getFilterTemplate() {
-        return filterTemplate;
-    }
-
-    /**
-     * This returns the ldap pool strategy this connector is using.
-     * 
-     * @return ldap pool strategy
-     */
-    public LdapPoolStrategy getLdapPool() {
-        return ldapPool;
-    }
-
-    /**
-     * This returns the attributes that all searches will request from the ldap.
-     * 
-     * @return <code>String[]</code>
-     */
-    public String[] getReturnAttributes() {
-        return returnAttributes;
-    }
-
-    /**
-     * This sets the attributes that all searches will request from the ldap. This method will remove any cached
-     * results.
-     * 
-     * @see #clearCache()
-     * 
-     * @param attributes <code>String[]</code>
-     */
-    public void setReturnAttributes(String[] attributes) {
-        returnAttributes = attributes;
-    }
-
-    /**
-     * This sets the attributes that all searches will request from the ldap. s should be a comma delimited string.
-     * 
-     * @param s <code>String[]</code> comma delimited returnAttributes
-     */
-    public void setReturnAttributes(String s) {
-        StringTokenizer st = new StringTokenizer(s, ",");
-        String[] ra = new String[st.countTokens()];
-        for (int count = 0; count < st.countTokens(); count++) {
-            ra[count] = st.nextToken();
-        }
-        setReturnAttributes(ra);
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        Ldap ldap = null;
-        try {
-            ldap = ldapPool.checkOut();
-            if(ldap == null){
-                log.error("Unable to retrieve an LDAP connection");
-                throw new AttributeResolutionException("Unable to retrieve LDAP connection");
-            }
-            if (!ldap.connect()) {
-                throw new NamingException();
-            }
-        } catch (NamingException e) {
-            log.error("An error occured when attempting to search the LDAP: " + ldap.getLdapConfig().getEnvironment(),
-                    e);
-            throw new AttributeResolutionException("An error occurred when attempting to search the LDAP", e);
-        } catch (Exception e) {
-            log.error("Could not retrieve Ldap object from pool", e);
-            throw new AttributeResolutionException(
-                    "An error occurred when attempting to retrieve a LDAP connection from the pool", e);
-        } finally {
-            if (ldap != null) {
-                try {
-                    ldapPool.checkIn(ldap);
-                } catch (Exception e) {
-                    log.error("Could not return Ldap object back to pool", e);
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> resolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        String searchFilter = filterCreator.createStatement(filterTemplateName, resolutionContext, getDependencyIds(),
-                escapingStrategy);
-        searchFilter = searchFilter.trim();
-        log.debug("Search filter: {}", searchFilter);
-
-        // attempt to get attributes from the cache
-        Map<String, BaseAttribute> attributes = retrieveAttributesFromCache(searchFilter);
-
-        // results not found in the cache
-        if (attributes == null) {
-            Iterator<SearchResult> results = searchLdap(searchFilter);
-
-            if (noResultsIsError && !results.hasNext()) {
-                log.debug("LDAP data connector " + getId()
-                        + " - No result returned and connector configured to treat this as an error.");
-                throw new AttributeResolutionException("No LDAP entry found for "
-                        + resolutionContext.getAttributeRequestContext().getPrincipalName());
-            }
-
-            // build resolved attributes from LDAP attributes and cache the result
-            attributes = buildBaseAttributes(results);
-            cacheResult(searchFilter, attributes);
-        }
-
-        return attributes;
-    }
-
-    /**
-     * This retrieves any cached attributes for the supplied resolution context. Returns null if nothing is cached.
-     * 
-     * @param searchFilter the search filter the produced the attributes
-     * 
-     * @return <code>Map</code> of attributes IDs to attributes
-     */
-    protected Map<String, BaseAttribute> retrieveAttributesFromCache(String searchFilter) {
-        if (!isCacheResults()) {
-            return null;
-        }
-
-        log.debug("LDAP data connector {} - Checking cache for search results", getId());
-        Element cachedResult = resultsCache.get(searchFilter);
-        if (cachedResult != null && !cachedResult.isExpired()) {
-            log.debug("LDAP data connector {} - Returning attributes from cache", getId());
-            return (Map<String, BaseAttribute>) cachedResult.getObjectValue();
-        }
-
-        log.debug("LDAP data connector {} - No results cached for search filter '{}'", getId(), searchFilter);
-        return null;
-    }
-
-    /**
-     * This searches the LDAP with the supplied filter.
-     * 
-     * @param searchFilter <code>String</code> the searchFilter that produced the attributes
-     * @return <code>Iterator</code> of search results
-     * @throws AttributeResolutionException if an error occurs performing the search
-     */
-    protected Iterator<SearchResult> searchLdap(String searchFilter) throws AttributeResolutionException {
-        log.debug("LDAP data connector {} - Retrieving attributes from LDAP", getId());
-
-        Ldap ldap = null;
-        try {
-            ldap = ldapPool.checkOut();
-            return ldap.search(new SearchFilter(searchFilter), returnAttributes);
-        } catch (NamingException e) {
-            log.debug("LDAP data connector " + getId() + " - An error occured when attempting to search the LDAP: "
-                    + ldap.getLdapConfig().getEnvironment(), e);
-            throw new AttributeResolutionException("An error occurred when attempting to search the LDAP");
-        } catch (Exception e) {
-            log.debug("LDAP data connector " + getId() + " - Could not perform ldap search", e);
-            throw new AttributeResolutionException("An error occurred when attempting to perform a LDAP search");
-        } finally {
-            if (ldap != null) {
-                try {
-                    ldapPool.checkIn(ldap);
-                } catch (Exception e) {
-                    log.error("LDAP data connector " + getId() + " - Could not return Ldap object back to pool", e);
-                }
-            }
-        }
-    }
-
-    /**
-     * This returns a map of attribute ids to attributes from the supplied search results.
-     * 
-     * @param results <code>Iterator</code> of LDAP search results
-     * @return <code>Map</code> of attribute ids to attributes
-     * @throws AttributeResolutionException if an error occurs parsing attribute results
-     */
-    protected Map<String, BaseAttribute> buildBaseAttributes(Iterator<SearchResult> results)
-            throws AttributeResolutionException {
-
-        Map<String, BaseAttribute> attributes = new HashMap<String, BaseAttribute>();
-
-        if (!results.hasNext()) {
-            return attributes;
-        }
-
-        SearchResult sr = results.next();
-        LdapAttributes ldapAttrs = null;
-        try {
-            ldapAttrs = LdapBeanProvider.getLdapBeanFactory().newLdapAttributes();
-            ldapAttrs.addAttributes(sr.getAttributes());
-        } catch (NamingException e) {
-            log.debug("LDAP data connector " + getId() + " - Error parsing LDAP attributes", e);
-            throw new AttributeResolutionException("Error parsing LDAP attributes", e);
-        }
-
-        for (LdapAttribute ldapAttr : ldapAttrs.getAttributes()) {
-            log.debug("LDAP data connector {} - Found the following attribute: {}", getId(), ldapAttr);
-            BaseAttribute attribute = attributes.get(ldapAttr.getName());
-            if (attribute == null) {
-                attribute = new BasicAttribute<String>(ldapAttr.getName());
-                attributes.put(ldapAttr.getName(), attribute);
-            }
-
-            Set<Object> values = ldapAttr.getValues();
-            if (values != null && !values.isEmpty()) {
-                for (Object value : values) {
-                    if (value instanceof String) {
-                        String s = (String) value;
-                        if (!DatatypeHelper.isEmpty(s)) {
-                            attribute.getValues().add(DatatypeHelper.safeTrimOrNullString(s));
-                        }
-                    } else {
-                        log.debug("LDAP data connector {} - Attribute {} contained a value that is not of type String",
-                                getId(), ldapAttr.getName());
-                        attribute.getValues().add(value);
-                    }
-                }
-            }
-        }
-
-        return attributes;
-    }
-
-    /**
-     * This stores the supplied attributes in the cache.
-     * 
-     * @param searchFilter the searchFilter that produced the attributes
-     * @param attributes <code>Map</code> of attribute IDs to attributes
-     */
-    protected void cacheResult(String searchFilter, Map<String, BaseAttribute> attributes) {
-        if (!isCacheResults()) {
-            return;
-        }
-
-        log.debug("LDAP data connector {} - Caching attributes from search '{}'", getId(), searchFilter);
-        resultsCache.put(new Element(searchFilter, attributes));
-    }
-
-    /**
-     * Escapes values that will be included within an LDAP filter.
-     */
-    protected class LDAPValueEscapingStrategy implements CharacterEscapingStrategy {
-
-        /** {@inheritDoc} */
-        public String escape(String value) {
-            return value.replace("*", "\\*").replace("(", "\\(").replace(")", "\\)").replace("\\", "\\");
-        }
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolEmptyStrategy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolEmptyStrategy.java.svn-base
deleted file mode 100644
index 3890f49..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolEmptyStrategy.java.svn-base
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import javax.naming.NamingException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.vt.middleware.ldap.Ldap;
-import edu.vt.middleware.ldap.pool.LdapFactory;
-import edu.vt.middleware.ldap.pool.LdapPoolConfig;
-
-/**
- * Ldap pool strategy that does no pooling.
- */
-public class LdapPoolEmptyStrategy implements LdapPoolStrategy {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(LdapPoolEmptyStrategy.class);
-
-    /** Factory for making ldap objects. */
-    private LdapFactory<Ldap> ldapFactory;
-
-    /**
-     * Default constructor.
-     */
-    public LdapPoolEmptyStrategy() {
-    }
-
-    /** {@inheritDoc} */
-    public void setLdapPoolConfig(LdapPoolConfig config) {
-    }
-
-    /** {@inheritDoc} */
-    public void setLdapFactory(LdapFactory<Ldap> factory) {
-        ldapFactory = factory;
-    }
-
-    /** {@inheritDoc} */
-    public void setBlockWhenEmpty(boolean block) {
-    }
-
-    /** {@inheritDoc} */
-    public void initialize() {
-        Ldap ldap = null;
-        try {
-            ldap = checkOut();
-            if (ldap == null) {
-                log.error("Unable to retrieve an LDAP connection");
-                throw new AttributeResolutionException("Unable to retrieve LDAP connection");
-            }
-            if (!ldap.connect()) {
-                throw new RuntimeException("Unable to connect to LDAP server");
-            }
-        } catch (NamingException e) {
-            log.error("An error occured when attempting to search the LDAP: " + ldap.getLdapConfig().getEnvironment(),
-                    e);
-            throw new RuntimeException("Unable to connect to LDAP server", e);
-        } catch (Exception e) {
-            log.error("Could not retrieve Ldap object from pool", e);
-            throw new RuntimeException("Could not retrieve Ldap object from pool", e);
-        } finally {
-            if (ldap != null) {
-                try {
-                    checkIn(ldap);
-                } catch (Exception e) {
-                    log.error("Could not return Ldap object back to pool", e);
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Ldap checkOut() throws Exception {
-        return ldapFactory.create();
-    }
-
-    /** {@inheritDoc} */
-    public void checkIn(Ldap l) throws Exception {
-        ldapFactory.destroy(l);
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolStrategy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolStrategy.java.svn-base
deleted file mode 100644
index 9307a72..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolStrategy.java.svn-base
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import edu.vt.middleware.ldap.Ldap;
-import edu.vt.middleware.ldap.pool.LdapFactory;
-import edu.vt.middleware.ldap.pool.LdapPoolConfig;
-
-/**
- * Used by the ldap data connector to interface with various pooling implementations. 
- */
-public interface LdapPoolStrategy {
-
-    /**
-     * Sets the ldap factory.
-     *
-     * @param  factory  to create ldap objects with
-     */
-    void setLdapFactory(LdapFactory<Ldap> factory);
-
-    /**
-     * Sets the ldap pool configuration.
-     *
-     * @param  config  to manage ldap pool with
-     */
-    void setLdapPoolConfig(LdapPoolConfig config);
-
-    /**
-     * Sets whether to block when the pool is empty.
-     *
-     * @param  block  when the pool is empty
-     */
-    void setBlockWhenEmpty(boolean block);
-
-    /**
-     * Prepare the pool for use.
-     */
-    void initialize();
-
-    /**
-     * Retrieve an ldap object.
-     * 
-     * @return  ldap object
-     * 
-     * @throws Exception thrown if there is a problem checking in an {@link Ldap} object
-     */
-    Ldap checkOut() throws Exception;
-
-    /**
-     * Return an ldap object.
-     *
-     * @param l the ldap object
-     * 
-     * @throws Exception thrown if there is a problem checking out an {@link Ldap} object
-     */
-    void checkIn(Ldap l) throws Exception;
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolVTStrategy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolVTStrategy.java.svn-base
deleted file mode 100644
index c6669f1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/LdapPoolVTStrategy.java.svn-base
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.vt.middleware.ldap.Ldap;
-import edu.vt.middleware.ldap.pool.BlockingLdapPool;
-import edu.vt.middleware.ldap.pool.LdapFactory;
-import edu.vt.middleware.ldap.pool.LdapPool;
-import edu.vt.middleware.ldap.pool.LdapPoolConfig;
-import edu.vt.middleware.ldap.pool.SoftLimitLdapPool;
-
-/** Ldap pool strategy backed by the vt-ldap library. */
-public class LdapPoolVTStrategy implements LdapPoolStrategy {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(LdapPoolVTStrategy.class);
-
-    /** Underlying pool. */
-    private LdapPool<Ldap> ldapPool;
-
-    /** Ldap pool configuration. */
-    private LdapPoolConfig ldapPoolConfig;
-
-    /** Factory for making ldap objects. */
-    private LdapFactory<Ldap> ldapFactory;
-
-    /** Whether to block when empty. */
-    private boolean blockWhenEmpty;
-
-    /** Amount of time to wait, in milliseconds, if blocking when the pool is empty. Default value: 0 */
-    private int blockWaitTime;
-
-    /**
-     * Default constructor.
-     */
-    public LdapPoolVTStrategy() {
-    }
-
-    /** {@inheritDoc} */
-    public void setLdapPoolConfig(LdapPoolConfig config) {
-        ldapPoolConfig = config;
-    }
-
-    /** {@inheritDoc} */
-    public void setLdapFactory(LdapFactory<Ldap> factory) {
-        ldapFactory = factory;
-    }
-
-    /** {@inheritDoc} */
-    public void setBlockWhenEmpty(boolean block) {
-        blockWhenEmpty = block;
-    }
-
-    /**
-     * Sets the amount of time to wait, in milliseconds, if blocking when the pool is empty. A value of 0 means to wait
-     * indefinitely.
-     * 
-     * @param waitTime amount of time to wait, in milliseconds, if blocking when the pool is empty
-     */
-    public void setBlockWaitTime(int waitTime) {
-        blockWaitTime = waitTime;
-    }
-
-    /** {@inheritDoc} */
-    public void initialize() {
-        Ldap ldap = null;
-
-        try {
-            ldapPoolConfig.setPruneTimerPeriod(ldapPoolConfig.getValidateTimerPeriod());
-            if (blockWhenEmpty) {
-                ldapPool = new BlockingLdapPool(ldapPoolConfig, ldapFactory);
-                ((BlockingLdapPool) ldapPool).setBlockWaitTime(blockWaitTime);
-            } else {
-                ldapPool = new SoftLimitLdapPool(ldapPoolConfig, ldapFactory);
-            }
-            ldapPool.initialize();
-        } catch (Exception e) {
-            log.error("Could not retrieve Ldap object from pool", e);
-            throw new RuntimeException("Could not retrieve Ldap object from pool", e);
-        } finally {
-            if (ldap != null) {
-                try {
-                    checkIn(ldap);
-                } catch (Exception e) {
-                    log.error("Could not return Ldap object back to pool", e);
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Ldap checkOut() throws Exception {
-        return ldapPool.checkOut();
-    }
-
-    /** {@inheritDoc} */
-    public void checkIn(Ldap l) throws Exception {
-        ldapPool.checkIn(l);
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/RDBMSColumnDescriptor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/RDBMSColumnDescriptor.java.svn-base
deleted file mode 100644
index cdfc795..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/RDBMSColumnDescriptor.java.svn-base
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.RDBMSDataConnector.DATA_TYPES;
-
-/**
- * Describes how to express a given result set column as an attribute and value.
- */
-public class RDBMSColumnDescriptor {
-
-    /** Name of the database column. */
-    private String columnName;
-
-    /** Name of the attribute to map the column to. */
-    private String attributeName;
-
-    /** Java data type to express the database value as. */
-    private DATA_TYPES dataType;
-
-    /**
-     * Constructor.
-     * 
-     * @param column name of the database column
-     * @param attribute name of the attribute to map the column to
-     * @param type Java data type to express the database value as
-     */
-    public RDBMSColumnDescriptor(String column, String attribute, DATA_TYPES type) {
-        columnName = column;
-        attributeName = attribute;
-        dataType = type;
-    }
-
-    /**
-     * Gets the name of the database column.
-     * 
-     * @return name of the database column
-     */
-    public String getColumnName() {
-        return columnName;
-    }
-
-    /**
-     * Gets the name of the attribute to map the column to.
-     * 
-     * @return name of the attribute to map the column to
-     */
-    public String getAttributeID() {
-        return attributeName;
-    }
-
-    /**
-     * Gets the Java data type to express the database value as.
-     * 
-     * @return Java data type to express the database value as
-     */
-    public DATA_TYPES getDataType() {
-        return dataType;
-    }
-
-    /** {@inheritDoc} */
-    public String toString() {
-        return "RBDMSColumnDescriptor{columnName=" + columnName + ", attributeId=" + attributeName + ", dataType="
-                + dataType + "}";
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/RDBMSDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/RDBMSDataConnector.java.svn-base
deleted file mode 100644
index 981b9e5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/RDBMSDataConnector.java.svn-base
+++ /dev/null
@@ -1,488 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * A data connector that can retrieve information from a relational database through JDBC, version 3.
- */
-public class RDBMSDataConnector extends BaseDataConnector {
-
-    /** Data types understood by this connector. */
-    public static enum DATA_TYPES {
-        BigDecimal, Boolean, Byte, ByteArray, Date, Double, Float, Integer, Long, Object, Short, String, Time, Timestamp, URL
-    };
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(RDBMSDataConnector.class);
-
-    /** JDBC data source for retrieving connections. */
-    private DataSource dataSource;
-
-    /** Template engine used to change query template into actual query. */
-    private TemplateEngine queryCreator;
-
-    /** Name the query template is registered under with the statement creator. */
-    private String queryTemplateName;
-
-    /** Template that produces the query to use. */
-    private String queryTemplate;
-    
-    /** SQL query timeout in seconds. */
-    private int queryTimeout;
-
-    /** Whether the JDBC connection is read-only. */
-    private boolean readOnlyConnection;
-
-    /** Whether queries might use stored procedures. */
-    private boolean usesStoredProcedure;
-
-    /** Whether an empty result set is an error. */
-    private boolean noResultIsError;
-
-    /** Set of column descriptors for managing returned data. [columnName => colmentDescriptr] */
-    private Map<String, RDBMSColumnDescriptor> columnDescriptors;
-    
-    /** Query result cache. */
-    private Cache resultsCache;
-    
-    /**
-     * Constructor.
-     * 
-     * @param source data source used to retrieve connections
-     * @param cache cache used to cache results
-     */
-    public RDBMSDataConnector(DataSource source, Cache cache) {
-        super();
-
-        dataSource = source;
-
-        resultsCache = cache;
-
-        readOnlyConnection = true;
-        usesStoredProcedure = false;
-        noResultIsError = false;
-
-        columnDescriptors = new HashMap<String, RDBMSColumnDescriptor>();
-    }
-
-    /**
-     * This sets the underlying template engine and registers the supplied template.
-     * 
-     * @param engine template engine used to generate the query
-     * @param template template used to generate the query
-     */
-    public void registerTemplate(TemplateEngine engine, String template) {
-        if (getId() == null) {
-            throw new IllegalStateException("Template cannot be registered until plugin id has been set");
-        }
-        queryCreator = engine;
-        queryTemplate = template;
-        queryTemplateName = "shibboleth.resolver.dc." + getId();
-        queryCreator.registerTemplate(queryTemplateName, queryTemplate);
-    }
-
-    /**
-     * Gets whether this data connector is caching results.
-     * 
-     * @return true if this data connector is caching results, false if not
-     */
-    public boolean isCachingResuts() {
-        return resultsCache != null;
-    }
-
-    /**
-     * Gets the timeout, in seconds, of the SQL query.
-     * 
-     * @return timeout, in seconds, of the SQL query
-     */
-    public int getQueryTimeout() {
-        return queryTimeout;
-    }
-    
-    /**
-     * Sets the timeout, in seconds, of the SQL query.
-     * 
-     * @param timeout timeout, in seconds, of the SQL query
-     */
-    public void setQueryTimeout(int timeout) {
-        queryTimeout = timeout;
-    }
-    
-    /**
-     * Gets whether this data connector uses read-only connections.
-     * 
-     * @return whether this data connector uses read-only connections
-     */
-    public boolean isConnectionReadOnly() {
-        return readOnlyConnection;
-    }
-
-    /**
-     * Sets whether this data connector uses read-only connections.
-     * 
-     * @param isReadOnly whether this data connector uses read-only connections
-     */
-    public void setConnectionReadOnly(boolean isReadOnly) {
-        readOnlyConnection = isReadOnly;
-    }
-
-    /**
-     * Gets whether queries made use stored procedures.
-     * 
-     * @return whether queries made use stored procedures
-     */
-    public boolean getUsesStoredProcedure() {
-        return usesStoredProcedure;
-    }
-
-    /**
-     * Sets whether queries made use stored procedures.
-     * 
-     * @param storedProcedure whether queries made use stored procedures
-     */
-    public void setUsesStoredProcedure(boolean storedProcedure) {
-        usesStoredProcedure = storedProcedure;
-    }
-
-    /**
-     * This returns whether this connector will throw an exception if no search results are found. The default is false.
-     * 
-     * @return <code>boolean</code>
-     */
-    public boolean isNoResultIsError() {
-        return noResultIsError;
-    }
-
-    /**
-     * This sets whether this connector will throw an exception if no search results are found.
-     * 
-     * @param isError <code>boolean</code>
-     */
-    public void setNoResultIsError(boolean isError) {
-        noResultIsError = isError;
-    }
-
-    /**
-     * Gets the set of column descriptors used to deal with result set data. The name of the database column is the
-     * map's key. This list is unmodifiable.
-     * 
-     * @return column descriptors used to deal with result set data
-     */
-    public Map<String, RDBMSColumnDescriptor> getColumnDescriptor() {
-        return columnDescriptors;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        log.debug("RDBMS data connector {} - Validating configuration.", getId());
-
-        if (dataSource == null) {
-            log.error("RDBMS data connector {} - Datasource is null", getId());
-            throw new AttributeResolutionException("Datasource is null");
-        }
-
-        Connection connection = null;
-        try {
-            connection = dataSource.getConnection();
-            if (connection == null) {
-                log.error("RDBMS data connector {} - Unable to create connections", getId());
-                throw new AttributeResolutionException("Unable to create connections for RDBMS data connector "
-                        + getId());
-            }
-
-            DatabaseMetaData dbmd = connection.getMetaData();
-            if (!dbmd.supportsStoredProcedures() && usesStoredProcedure) {
-                log.error("RDBMS data connector {} - Database does not support stored procedures.", getId());
-                throw new AttributeResolutionException("Database does not support stored procedures.");
-            }
-
-            log.debug("RDBMS data connector {} - Connector configuration is valid.", getId());
-        } catch (SQLException e) {
-            if (e.getSQLState() != null) {
-                log.error("RDBMS data connector {} - Invalid connector configuration; SQL state: {}, SQL Code: {}",
-                        new Object[] { getId(), e.getSQLState(), e.getErrorCode() }, e);
-            } else {
-                log.error("RDBMS data connector {} - Invalid connector configuration", new Object[] { getId() }, e);
-            }
-            throw new AttributeResolutionException("Invalid connector configuration", e);
-        } finally {
-            try {
-                if (connection != null && !connection.isClosed()) {
-                    connection.close();
-                }
-            } catch (SQLException e) {
-                log.error("RDBMS data connector {} - Error closing database connection; SQL State: {}, SQL Code: {}",
-                        new Object[] { getId(), e.getSQLState(), e.getErrorCode() }, e);
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> resolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        String query = queryCreator.createStatement(queryTemplateName, resolutionContext, getDependencyIds(), null);
-        log.debug("RDBMS data connector {} - Search Query: {}", getId(), query);
-
-        Map<String, BaseAttribute> resolvedAttributes = null;
-        resolvedAttributes = retrieveAttributesFromCache(resolutionContext.getAttributeRequestContext()
-                .getPrincipalName(), query);
-
-        if (resolvedAttributes == null) {
-            resolvedAttributes = retrieveAttributesFromDatabase(query);
-        }
-
-        cacheResult(resolutionContext.getAttributeRequestContext().getPrincipalName(), query, resolvedAttributes);
-
-        return resolvedAttributes;
-    }
-
-    /**
-     * Attempts to retrieve the attributes from the cache.
-     * 
-     * @param principal the principal name of the user the attributes are for
-     * @param query query used to generate the attributes
-     * 
-     * @return cached attributes
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem retrieving data from the cache
-     */
-    protected Map<String, BaseAttribute> retrieveAttributesFromCache(String principal, String query)
-            throws AttributeResolutionException {
-        if (resultsCache == null) {
-            return null;
-        }
-
-        Element cacheElement = resultsCache.get(query);
-        if (cacheElement != null && !cacheElement.isExpired()) {
-            log.debug("RDBMS data connector {} - Fetched attributes from cache for principal {}", getId(), principal);
-            return (Map<String, BaseAttribute>) cacheElement.getObjectValue();
-        }
-
-        return null;
-    }
-
-    /**
-     * Attempts to retrieve the attribute from the database.
-     * 
-     * @param query query used to get the attributes
-     * 
-     * @return attributes gotten from the database
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem retrieving data from the database or
-     *             transforming that data into {@link BaseAttribute}s
-     */
-    protected Map<String, BaseAttribute> retrieveAttributesFromDatabase(String query)
-            throws AttributeResolutionException {
-        Map<String, BaseAttribute> resolvedAttributes;
-        Connection connection = null;
-        ResultSet queryResult = null;
-
-        try {
-            connection = dataSource.getConnection();
-            if (readOnlyConnection) {
-                connection.setReadOnly(true);
-            }
-            log.debug("RDBMS data connector {} - Querying database for attributes with query {}", getId(), query);
-            Statement stmt = connection.createStatement();
-            stmt.setQueryTimeout(queryTimeout);
-            queryResult = stmt.executeQuery(query);
-            resolvedAttributes = processResultSet(queryResult);
-            if (resolvedAttributes.isEmpty() && noResultIsError) {
-                log.debug("RDBMS data connector {} - No attributes from query", getId());
-                throw new AttributeResolutionException("No attributes returned from query");
-            }
-            log.debug("RDBMS data connector {} - Retrieved attributes: {}", getId(), resolvedAttributes.keySet());
-            return resolvedAttributes;
-        } catch (SQLException e) {
-            log.debug("RDBMS data connector {} - Unable to execute SQL query {}; SQL State: {}, SQL Code: {}",
-                    new Object[] { getId(), query, e.getSQLState(), e.getErrorCode(), }, e);
-            throw new AttributeResolutionException("Unable to execute SQL query", e);
-        } finally {
-            try {
-                if (queryResult != null) {
-                    queryResult.close();
-                }
-
-                if (connection != null && !connection.isClosed()) {
-                    connection.close();
-                }
-            } catch (SQLException e) {
-                log.debug("RDBMS data connector {} - Unable to close database connection; SQL State: {}, SQL Code: {}",
-                        new Object[] { getId(), e.getSQLState(), e.getErrorCode() }, e);
-            }
-        }
-    }
-
-    /**
-     * Converts a SQL query results set into a set of {@link BaseAttribute}s.
-     * 
-     * @param resultSet the result set to convert
-     * 
-     * @return the resultant set of attributes
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem converting the result set into attributes
-     */
-    protected Map<String, BaseAttribute> processResultSet(ResultSet resultSet) throws AttributeResolutionException {
-        Map<String, BaseAttribute> attributes = new HashMap<String, BaseAttribute>();
-
-        try {
-            if (!resultSet.next()) {
-                return attributes;
-            }
-
-            ResultSetMetaData resultMD = resultSet.getMetaData();
-            int numOfCols = resultMD.getColumnCount();
-            String columnName;
-            RDBMSColumnDescriptor columnDescriptor;
-            String attributeId;
-            BaseAttribute attribute;
-            Collection attributeValues;
-            
-            do {
-                for (int i = 1; i <= numOfCols; i++) {
-                    columnName = resultMD.getColumnName(i);
-                    columnDescriptor = columnDescriptors.get(columnName);
-
-                    if (columnDescriptor == null || columnDescriptor.getAttributeID() == null) {
-                        attributeId = columnName;
-                    } else {
-                        attributeId = columnDescriptor.getAttributeID();
-                    }
-                    
-                    attribute = attributes.get(attributeId);
-                    if (attribute == null) {
-                        attribute = new BasicAttribute(attributeId);
-                    }
-
-                    attributes.put(attribute.getId(), attribute);
-                    attributeValues = attribute.getValues();
-                    if (columnDescriptor == null || columnDescriptor.getDataType() == null) {
-                        attributeValues.add(resultSet.getObject(i));
-                    } else {
-                        addValueByType(attributeValues, columnDescriptor.getDataType(), resultSet, i);
-                    }
-                }
-            } while (resultSet.next());
-        } catch (SQLException e) {
-            log.debug("RDBMS data connector {} - Unable to read data from query result; SQL State: {}, SQL Code: {}",
-                    new Object[] { getId(), e.getSQLState(), e.getErrorCode() }, e);
-        }
-
-        return attributes;
-    }
-
-    /**
-     * Adds a value extracted from the result set as a specific type into the value set.
-     * 
-     * @param values set to add values into
-     * @param type type the value should be extracted as
-     * @param resultSet result set, on the current row, to extract the value from
-     * @param columnIndex index of the column from which to extract the attribute
-     * 
-     * @throws SQLException thrown if value can not retrieved from the result set
-     */
-    protected void addValueByType(Collection values, DATA_TYPES type, ResultSet resultSet, int columnIndex)
-            throws SQLException {
-        switch (type) {
-            case BigDecimal:
-                values.add(resultSet.getBigDecimal(columnIndex));
-                break;
-            case Boolean:
-                values.add(resultSet.getBoolean(columnIndex));
-                break;
-            case Byte:
-                values.add(resultSet.getByte(columnIndex));
-                break;
-            case ByteArray:
-                values.add(resultSet.getBytes(columnIndex));
-                break;
-            case Date:
-                values.add(resultSet.getDate(columnIndex));
-                break;
-            case Double:
-                values.add(resultSet.getDouble(columnIndex));
-                break;
-            case Float:
-                values.add(resultSet.getFloat(columnIndex));
-                break;
-            case Integer:
-                values.add(resultSet.getInt(columnIndex));
-                break;
-            case Long:
-                values.add(resultSet.getLong(columnIndex));
-                break;
-            case Object:
-                values.add(resultSet.getObject(columnIndex));
-                break;
-            case Short:
-                values.add(resultSet.getShort(columnIndex));
-                break;
-            case Time:
-                values.add(resultSet.getTime(columnIndex));
-                break;
-            case Timestamp:
-                values.add(resultSet.getTimestamp(columnIndex));
-                break;
-            case URL:
-                values.add(resultSet.getURL(columnIndex));
-                break;
-            default:
-                values.add(resultSet.getString(columnIndex));
-        }
-    }
-
-    /**
-     * Caches the attributes resulting from a query.
-     * 
-     * @param principal the principal name of the user the attributes are for
-     * @param query the query that generated the attributes
-     * @param attributes the results of the query
-     */
-    protected void cacheResult(String principal, String query, Map<String, BaseAttribute> attributes) {
-        if (resultsCache == null) {
-            return;
-        }
-
-        log.debug("RDBMS data connector {} - Caching attributes for principal {}", getId(), principal);
-        Element cacheElement = new Element(query, attributes);
-        resultsCache.put(cacheElement);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StaticDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StaticDataConnector.java.svn-base
deleted file mode 100644
index 044df49..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StaticDataConnector.java.svn-base
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/** Data connector implementation that returns statically defined attributes. */
-public class StaticDataConnector extends BaseDataConnector {
-
-    /** Source Data. */
-    private Map<String, BaseAttribute> attributes;
-
-    /**
-     * Constructor.
-     * 
-     * @param staticAttributes attributes this data connector will return
-     */
-    public StaticDataConnector(List<BaseAttribute<String>> staticAttributes) {
-        attributes = new HashMap<String, BaseAttribute>(staticAttributes.size());
-        if (staticAttributes != null) {            
-            for (BaseAttribute<String> attribute : staticAttributes) {
-                attributes.put(attribute.getId(), attribute);
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> resolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        return attributes;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        // Do nothing
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StoredIDDataConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StoredIDDataConnector.java.svn-base
deleted file mode 100644
index de5e93d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StoredIDDataConnector.java.svn-base
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.sql.DataSource;
-
-import org.opensaml.saml2.core.SubjectQuery;
-import org.opensaml.saml2.core.AuthnRequest;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.util.Base64;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.LazyMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StoredIDStore.PersistentIdEntry;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-
-/**
- * A data connector that generates persistent identifiers in one of two ways. The generated attribute has an ID of
- * <tt>peristentId</tt> and contains a single {@link String} value.
- * 
- * If a salt is supplied at construction time the generated IDs will be the Base64-encoded SHA-1 hash of the user's
- * principal name, the peer entity ID, and the salt.
- * 
- * If a {@link DataSource} is supplied the IDs are created and managed as described by {@link StoredIDStore}.
- */
-public class StoredIDDataConnector extends BaseDataConnector {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StoredIDDataConnector.class);
-
-    /** Persistent identifier data store. */
-    private StoredIDStore pidStore;
-
-    /** ID of the attribute generated by this data connector. */
-    private String generatedAttribute;
-
-    /** ID of the attribute whose first value is used when generating the computed ID. */
-    private String sourceAttribute;
-
-    /** Salt used when computing the ID. */
-    private byte[] salt;
-
-    /**
-     * Constructor.
-     * 
-     * @param source datasource used to communicate with the database
-     * @param queryTimeout SQL qeury timeout in seconds
-     * @param generatedAttributeId ID of the attribute generated by this data connector
-     * @param sourceAttributeId ID of the attribute whose first value is used when generating the computed ID
-     * @param idSalt salt used when computing the ID
-     */
-    public StoredIDDataConnector(DataSource source, int queryTimeout, String generatedAttributeId,
-            String sourceAttributeId, byte[] idSalt) {
-        if (source == null) {
-            throw new IllegalArgumentException("Data source may not be null");
-        }
-        pidStore = new StoredIDStore(source, queryTimeout);
-
-        if (DatatypeHelper.isEmpty(generatedAttributeId)) {
-            throw new IllegalArgumentException("Provided generated attribute ID must not be empty");
-        }
-        generatedAttribute = generatedAttributeId;
-
-        if (DatatypeHelper.isEmpty(sourceAttributeId)) {
-            throw new IllegalArgumentException("Provided source attribute ID must not be empty");
-        }
-        sourceAttribute = sourceAttributeId;
-
-        if (idSalt.length < 16) {
-            throw new IllegalArgumentException("Provided salt must be at least 16 bytes in size.");
-        }
-        salt = idSalt;
-    }
-
-    /**
-     * Gets the data store used to manage stored IDs.
-     * 
-     * @return data store used to manage stored IDs
-     */
-    public StoredIDStore getStoredIDStore() {
-        return pidStore;
-    }
-
-    /**
-     * Gets the salt used when computing the ID.
-     * 
-     * @return salt used when computing the ID
-     */
-    public byte[] getSalt() {
-        return salt;
-    }
-
-    /**
-     * Gets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @return ID of the attribute whose first value is used when generating the computed ID
-     */
-    public String getSourceAttributeId() {
-        return sourceAttribute;
-    }
-
-    /**
-     * Gets the ID of the attribute generated by this connector.
-     * 
-     * @return ID of the attribute generated by this connector
-     */
-    public String getGeneratedAttributeId() {
-        return generatedAttribute;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if (getDependencyIds() == null || getDependencyIds().size() != 1) {
-            log.error("Stored ID " + getId() + " data connectore requires exactly one dependency");
-            throw new AttributeResolutionException("Computed ID " + getId()
-                    + " data connectore requires exactly one dependency");
-        }
-
-        try {
-            pidStore.getActivePersistentIdEntry("1");
-        } catch (SQLException e) {
-            throw new AttributeResolutionException("Unable to connect to persistent ID store.");
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> resolve(ShibbolethResolutionContext resolutionContext)
-            throws AttributeResolutionException {
-        Map<String, BaseAttribute> attributes = new LazyMap<String, BaseAttribute>();
-
-        String principalName =
-                DatatypeHelper.safeTrimOrNullString(resolutionContext.getAttributeRequestContext().getPrincipalName());
-
-        String localId = getLocalId(resolutionContext);
-        if (localId == null) {
-            log.debug("No user local ID available, skipping ID creation.");
-            return attributes;
-        }
-
-        String localEntityId =
-                DatatypeHelper.safeTrimOrNullString(resolutionContext.getAttributeRequestContext().getLocalEntityId());
-        if (localEntityId == null) {
-            log.debug("No local entity ID available, skipping ID creation.");
-            return attributes;
-        }
-
-        String peerEntityId = getPeerEntityId(resolutionContext);
-        if (peerEntityId == null) {
-            log.debug("No peer entity ID available, skipping ID creation.");
-            return attributes;
-        }
-
-        String persistentId = getStoredId(principalName, localEntityId, peerEntityId, localId);
-        if (persistentId != null) {
-            BasicAttribute<String> attribute = new BasicAttribute<String>();
-            attribute.setId(getGeneratedAttributeId());
-            attribute.getValues().add(persistentId);
-            attributes.put(attribute.getId(), attribute);
-        }
-        return attributes;
-    }
-
-    /**
-     * Gets the persistent ID stored in the database. If one does not exist it is created.
-     * 
-     * @param principalName principal name of the user to whom the persistent ID belongs
-     * @param localEntityId ID of the local entity associated with the persistent ID
-     * @param peerEntityId ID of the peer entity associated with the persistent ID
-     * @param localId principal the the persistent ID represents
-     * 
-     * @return persistent ID
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem retrieving or storing the persistent ID
-     */
-    protected String getStoredId(String principalName, String localEntityId, String peerEntityId, String localId)
-            throws AttributeResolutionException {
-        PersistentIdEntry idEntry;
-        try {
-            log.debug("Checking for existing, active, stored ID for principal '{}'", principalName);
-            idEntry = pidStore.getActivePersistentIdEntry(localEntityId, peerEntityId, localId);
-            if (idEntry == null) {
-                log.debug("No existing, active, stored ID, creating a new one for principal '{}'", principalName);
-                idEntry = createPersistentId(principalName, localEntityId, peerEntityId, localId);
-                pidStore.storePersistentIdEntry(idEntry);
-                log.debug("Created stored ID '{}'", idEntry);
-            } else {
-                log.debug("Located existing stored ID {}", idEntry);
-            }
-
-            return idEntry.getPersistentId();
-        } catch (SQLException e) {
-            log.debug("Database error retrieving persistent identifier", e);
-            throw new AttributeResolutionException("Database error retrieving persistent identifier", e);
-        }
-    }
-
-    /**
-     * Gets the local ID component of the persistent ID.
-     * 
-     * @param resolutionContext current resolution context
-     * 
-     * @return local ID component of the persistent ID
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem resolving the local id
-     */
-    protected String getLocalId(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        Collection<Object> sourceIdValues = getValuesFromAllDependencies(resolutionContext, getSourceAttributeId());
-        if (sourceIdValues == null || sourceIdValues.isEmpty()) {
-            log.debug("Source attribute {} for connector {} provide no values.  No identifier will be generated.",
-                    getSourceAttributeId(), getId());
-            return null;
-        }
-
-        if (sourceIdValues.size() > 1) {
-            log.warn("Source attribute {} for connector {} has more than one value, only the first value is used",
-                    getSourceAttributeId(), getId());
-        }
-
-        return sourceIdValues.iterator().next().toString();
-    }
-
-    /**
-     * Gets the entity ID used for the peer. If the inbound request is a SAML 2 authentication context and contains a
-     * NameIDPolicy than the SPNameQualifier is used if present, otherwise the inbound message issuer is used.
-     * 
-     * @param resolutionContext current attribute resolution context
-     * 
-     * @return the entity ID to use for the peer
-     */
-    protected String getPeerEntityId(ShibbolethResolutionContext resolutionContext) {
-        SAMLProfileRequestContext requestContext = resolutionContext.getAttributeRequestContext();
-        
-        String peerEntityId = null;
-
-        log.debug("Determining if peer entity ID will be the SPNameQualifier from a SAML 2 authentication statement");
-        XMLObject inboundMessage = requestContext.getInboundSAMLMessage();
-        if (inboundMessage instanceof AuthnRequest) {
-            AuthnRequest authnRequest = (AuthnRequest) inboundMessage;
-            if (authnRequest.getNameIDPolicy() != null) {
-                peerEntityId = DatatypeHelper.safeTrimOrNullString(authnRequest.getNameIDPolicy().getSPNameQualifier());
-                if (peerEntityId == null) {
-                    log.debug("SAML 2 authentication request did not contain an SPNameQualifier within its NameIDPolicy");
-                } else {
-                    log.debug("SAML 2 authentication request contained an SPNameQualifier, within its NameIDPolicy.  Using that as peer entity ID");
-                }
-            } else {
-                log.debug("SAML 2 authentication request did not contain a NameIDPolicy");
-            }
-        } else if (inboundMessage instanceof SubjectQuery) {
-            SubjectQuery query = (SubjectQuery) inboundMessage;
-            if (query.getSubject().getNameID().getSPNameQualifier() != null) {
-                peerEntityId =
-                        DatatypeHelper.safeTrimOrNullString(query.getSubject().getNameID().getSPNameQualifier());
-                if (peerEntityId == null) {
-                    log.debug("SAML 2 subject query did not contain an SPNameQualifier within its NameID");
-                } else {
-                    log.debug("SAML 2 subject query contained an SPNameQualifier, within its NameID.  Using that as peer entity ID");
-                }
-            } else {
-                log.debug("SAML 2 attribute query did not contain a SPNameQualifier");
-            }
-        } else {
-            peerEntityId = requestContext.getInboundMessageIssuer(); 
-        }
-
-        if (peerEntityId == null) {
-            log.debug("Determining if inbound message issuer is available for use as peer entity ID");
-            peerEntityId = resolutionContext.getAttributeRequestContext().getInboundMessageIssuer();
-        }
-
-        return peerEntityId;
-    }
-
-    /**
-     * Creates a persistent ID that is unique for a given local/peer/localId tuple.
-     * 
-     * If an ID has never been issued for to the given tuple then an ID is created by taking a SHA-1 hash of the peer's
-     * entity ID, the local ID, and a salt. This is to ensure compatability with IDs created by the now deprecated
-     * {@link ComputedIDDataConnector}.
-     * 
-     * If an ID has been issued to the given tuple than a new, random type 4 UUID is generated as the persistent ID.
-     * 
-     * @param principalName principal name of the user to whom the persistent ID belongs
-     * @param localEntityId ID of the local entity associated with the persistent ID
-     * @param peerEntityId ID of the peer entity associated with the persistent ID
-     * @param localId principal the the persistent ID represents
-     * 
-     * @return the created identifier
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    protected PersistentIdEntry createPersistentId(String principalName, String localEntityId, String peerEntityId,
-            String localId) throws SQLException {
-        PersistentIdEntry entry = pidStore.new PersistentIdEntry();
-        entry.setLocalEntityId(localEntityId);
-        entry.setPeerEntityId(peerEntityId);
-        entry.setPrincipalName(principalName);
-        entry.setLocalId(localId);
-
-        String persistentId;
-        int numberOfExistingEntries =
-                pidStore.getNumberOfPersistentIdEntries(entry.getLocalEntityId(), entry.getPeerEntityId(),
-                        entry.getLocalId());
-
-        if (numberOfExistingEntries == 0) {
-            try {
-                MessageDigest md = MessageDigest.getInstance("SHA");
-                md.update(entry.getPeerEntityId().getBytes());
-                md.update((byte) '!');
-                md.update(localId.getBytes());
-                md.update((byte) '!');
-                persistentId = Base64.encodeBytes(md.digest(salt));
-            } catch (NoSuchAlgorithmException e) {
-                log.error("JVM error, SHA-1 is not supported, unable to compute ID");
-                throw new SQLException("SHA-1 is not supported, unable to compute ID");
-            }
-        } else {
-            persistentId = UUID.randomUUID().toString();
-        }
-
-        while (pidStore.getPersistentIdEntry(persistentId, false) != null) {
-            log.debug("Generated persistent ID was already assigned to another user, regenerating");
-            persistentId = UUID.randomUUID().toString();
-        }
-
-        entry.setPersistentId(persistentId);
-
-        entry.setCreationTime(new Timestamp(System.currentTimeMillis()));
-
-        return entry;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StoredIDStore.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StoredIDStore.java.svn-base
deleted file mode 100644
index f1cb374..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/StoredIDStore.java.svn-base
+++ /dev/null
@@ -1,734 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.io.Serializable;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Represents as persistent, database-backed, store of identifiers.
- * 
- * The DDL for the database is
- * 
- * <tt>CREATE TABLE shibpid {localEntity VARCHAR NOT NULL, peerEntity VARCHAR NOT NULL, principalName VARCHAR NOT NULL, localId VARCHAR NOT NULL, persistentId VARCHAR NOT NULL, peerProvidedId VARCHAR, creationDate TIMESTAMP NOT NULL, deactivationDate TIMESTAMP}</tt>
- * .
- */
-public class StoredIDStore {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StoredIDStore.class);
-
-    /** JDBC data source for retrieving connections. */
-    private DataSource dataSource;
-
-    /** Timeout of SQL queries in seconds. */
-    private int queryTimeout;
-
-    /** Name of the database table. */
-    private final String table = "shibpid";
-
-    /** Name of the local entity ID column. */
-    private final String localEntityColumn = "localEntity";
-
-    /** Name of the peer entity ID name column. */
-    private final String peerEntityColumn = "peerEntity";
-
-    /** Name of the principal name column. */
-    private final String principalNameColumn = "principalName";
-
-    /** Name of the local ID column. */
-    private final String localIdColumn = "localId";
-
-    /** Name of the persistent ID column. */
-    private final String persistentIdColumn = "persistentId";
-
-    /** ID, provided by peer, associated with the persistent ID. */
-    private final String peerProvidedIdColumn = "peerProvidedId";
-
-    /** Name of the creation time column. */
-    private final String createTimeColumn = "creationDate";
-
-    /** Name of the deactivation time column. */
-    private final String deactivationTimeColumn = "deactivationDate";
-
-    /** Partial select query for ID entries. */
-    private final String idEntrySelectSQL = "SELECT * FROM " + table + " WHERE ";
-
-    /** SQL used to deactivate an ID. */
-    private final String deactivateIdSQL = "UPDATE " + table + " SET " + deactivationTimeColumn + "= ? WHERE "
-            + persistentIdColumn + "= ?";
-
-    /**
-     * Constructor.
-     * 
-     * @param source datasource used to communicate with the database
-     * @param timeout SQL query timeout in seconds
-     */
-    public StoredIDStore(DataSource source, int timeout) {
-        dataSource = source;
-        queryTimeout = timeout;
-    }
-
-    /**
-     * Gets the number of persistent ID entries for a (principal, peer, local) tuple.
-     * 
-     * @param localEntity entity ID of the ID issuer
-     * @param peerEntity entity ID of the peer the ID is for
-     * @param localId local ID part of the persistent ID
-     * 
-     * @return the number of identifiers
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    public int getNumberOfPersistentIdEntries(String localEntity, String peerEntity, String localId)
-            throws SQLException {
-        StringBuilder sqlBuilder = new StringBuilder();
-        sqlBuilder.append("SELECT");
-        sqlBuilder.append(" count(").append(persistentIdColumn).append(")");
-        sqlBuilder.append(" FROM ").append(table).append(" WHERE ");
-        sqlBuilder.append(localEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ");
-        sqlBuilder.append(peerEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ");
-        sqlBuilder.append(localIdColumn).append(" = ?");
-
-        String sql = sqlBuilder.toString();
-        Connection dbConn = dataSource.getConnection();
-        try {
-            log.debug("Selecting number of persistent ID entries based on prepared sql statement: {}", sql);
-            PreparedStatement statement = dbConn.prepareStatement(sql);
-            statement.setQueryTimeout(queryTimeout);
-
-            log.debug("Setting prepared statement parameter {}: {}", 1, localEntity);
-            statement.setString(1, localEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 2, peerEntity);
-            statement.setString(2, peerEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 3, localId);
-            statement.setString(3, localId);
-
-            ResultSet rs = statement.executeQuery();
-            rs.next();
-            return rs.getInt(1);
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    /**
-     * Gets all the persistent ID entries for a (principal, peer, local) tuple.
-     * 
-     * @param localId local ID part of the persistent ID
-     * @param peerEntity entity ID of the peer the ID is for
-     * @param localEntity entity ID of the ID issuer
-     * 
-     * @return the active identifier
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    public List<PersistentIdEntry> getPersistentIdEntries(String localEntity, String peerEntity, String localId)
-            throws SQLException {
-        StringBuilder sqlBuilder = new StringBuilder(idEntrySelectSQL);
-        sqlBuilder.append(localEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(peerEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(localIdColumn).append(" = ?");
-        String sql = sqlBuilder.toString();
-
-        log.debug("Selecting all persistent ID entries based on prepared sql statement: {}", sql);
-
-        Connection dbConn = dataSource.getConnection();
-        try {
-            PreparedStatement statement = dbConn.prepareStatement(sql);
-            statement.setQueryTimeout(queryTimeout);
-
-            log.debug("Setting prepared statement parameter {}: {}", 1, localEntity);
-            statement.setString(1, localEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 2, peerEntity);
-            statement.setString(2, peerEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 3, localId);
-            statement.setString(3, localId);
-
-            return buildIdentifierEntries(statement.executeQuery());
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    /**
-     * Gets the persistent ID entry for the given ID.
-     * 
-     * @param persistentId the persistent ID
-     * 
-     * @return the ID entry for the given ID
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    public PersistentIdEntry getActivePersistentIdEntry(String persistentId) throws SQLException {
-        return getPersistentIdEntry(persistentId, true);
-    }
-
-    /**
-     * Gets the persistent ID entry for the given ID.
-     * 
-     * @param persistentId the persistent ID
-     * @param onlyActiveId true if only an active ID should be returned, false if a deactivated ID may be returned
-     * 
-     * @return the ID entry for the given ID
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    public PersistentIdEntry getPersistentIdEntry(String persistentId, boolean onlyActiveId) throws SQLException {
-        StringBuilder sqlBuilder = new StringBuilder(idEntrySelectSQL);
-        sqlBuilder.append(persistentIdColumn).append(" = ?");
-        if (onlyActiveId) {
-            sqlBuilder.append(" AND ").append(deactivationTimeColumn).append(" IS NULL");
-        }
-        String sql = sqlBuilder.toString();
-
-        log.debug("Selecting persistent ID entry based on prepared sql statement: {}", sql);
-
-        Connection dbConn = dataSource.getConnection();
-        try {
-            PreparedStatement statement = dbConn.prepareStatement(sql);
-            statement.setQueryTimeout(queryTimeout);
-
-            log.debug("Setting prepared statement parameter {}: {}", 1, persistentId);
-            statement.setString(1, persistentId);
-
-            List<PersistentIdEntry> entries = buildIdentifierEntries(statement.executeQuery());
-
-            if (entries == null || entries.size() == 0) {
-                return null;
-            }
-
-            if (entries.size() > 1) {
-                log.warn("More than one identifier found, only the first will be used");
-            }
-
-            return entries.get(0);
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    public PersistentIdEntry getActivePersistentIdEntry(String localEntity, String peerEntity, String localId,
-            boolean isActive) throws SQLException {
-        StringBuilder sqlBuilder = new StringBuilder(idEntrySelectSQL);
-        sqlBuilder.append(localEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(peerEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(localIdColumn).append(" = ?");
-        if(isActive){
-            sqlBuilder.append(" AND ").append(deactivationTimeColumn).append(" IS NULL");
-        }else{
-            sqlBuilder.append(" AND ").append(deactivationTimeColumn).append(" IS NOT NULL");
-        }
-        String sql = sqlBuilder.toString();
-
-        log.debug("Selecting persistent ID entry based on prepared sql statement: {}", sql);
-        Connection dbConn = dataSource.getConnection();
-        try {
-            PreparedStatement statement = dbConn.prepareStatement(sql);
-            statement.setQueryTimeout(queryTimeout);
-
-            log.debug("Setting prepared statement parameter {}: {}", 1, localEntity);
-            statement.setString(1, localEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 2, peerEntity);
-            statement.setString(2, peerEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 3, localId);
-            statement.setString(3, localId);
-
-            log.debug("Getting active persistent Id entries.");
-            List<PersistentIdEntry> entries = buildIdentifierEntries(statement.executeQuery());
-
-            if (entries == null || entries.size() == 0) {
-                return null;
-            }
-
-            if (entries.size() > 1) {
-                log.warn("More than one active identifier, only the first will be used");
-            }
-
-            return entries.get(0);
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    /**
-     * Gets the currently active identifier entry for a (principal, peer, local) tuple.
-     * 
-     * @param localId local ID part of the persistent ID
-     * @param peerEntity entity ID of the peer the ID is for
-     * @param localEntity entity ID of the ID issuer
-     * 
-     * @return the active identifier
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    public PersistentIdEntry getActivePersistentIdEntry(String localEntity, String peerEntity, String localId)
-            throws SQLException {
-        StringBuilder sqlBuilder = new StringBuilder(idEntrySelectSQL);
-        sqlBuilder.append(localEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(peerEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(localIdColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(deactivationTimeColumn).append(" IS NULL");
-        String sql = sqlBuilder.toString();
-
-        log.debug("Selecting active persistent ID entry based on prepared sql statement: {}", sql);
-        Connection dbConn = dataSource.getConnection();
-        try {
-            PreparedStatement statement = dbConn.prepareStatement(sql);
-            statement.setQueryTimeout(queryTimeout);
-
-            log.debug("Setting prepared statement parameter {}: {}", 1, localEntity);
-            statement.setString(1, localEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 2, peerEntity);
-            statement.setString(2, peerEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 3, localId);
-            statement.setString(3, localId);
-
-            log.debug("Getting active persistent Id entries.");
-            List<PersistentIdEntry> entries = buildIdentifierEntries(statement.executeQuery());
-
-            if (entries == null || entries.size() == 0) {
-                return null;
-            }
-
-            if (entries.size() > 1) {
-                log.warn("More than one active identifier, only the first will be used");
-            }
-
-            return entries.get(0);
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    /**
-     * Gets the list of deactivated IDs for a given (principal, peer, local) tuple.
-     * 
-     * @param localId local component of the Id
-     * @param peerEntity entity ID of the peer the ID is for
-     * @param localEntity entity ID of the ID issuer
-     * 
-     * @return list of deactivated identifiers
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    public List<PersistentIdEntry> getDeactivatedPersistentIdEntries(String localEntity, String peerEntity,
-            String localId) throws SQLException {
-        StringBuilder sqlBuilder = new StringBuilder(idEntrySelectSQL);
-        sqlBuilder.append(localEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(peerEntityColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(localIdColumn).append(" = ?");
-        sqlBuilder.append(" AND ").append(deactivationTimeColumn).append(" IS NOT NULL");
-        String sql = sqlBuilder.toString();
-
-        log.debug("Selecting deactivated persistent ID entries based on prepared sql statement: {}", sql);
-        Connection dbConn = dataSource.getConnection();
-        try {
-            PreparedStatement statement = dbConn.prepareStatement(sql);
-            statement.setQueryTimeout(queryTimeout);
-
-            log.debug("Setting prepared statement parameter {}: {}", 1, localEntity);
-            statement.setString(1, localEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 2, peerEntity);
-            statement.setString(2, peerEntity);
-            log.debug("Setting prepared statement parameter {}: {}", 3, localId);
-            statement.setString(3, localId);
-
-            log.debug("Getting deactivated persistent Id entries");
-            List<PersistentIdEntry> entries = buildIdentifierEntries(statement.executeQuery());
-
-            if (entries == null || entries.size() == 0) {
-                return null;
-            }
-
-            return entries;
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    /**
-     * Stores a persistent ID entry into the database.
-     * 
-     * @param entry entry to persist
-     * 
-     * @throws SQLException thrown is there is a problem writing to the database
-     */
-    public void storePersistentIdEntry(PersistentIdEntry entry) throws SQLException {
-
-        StringBuilder sqlBuilder = new StringBuilder("INSERT INTO ");
-        sqlBuilder.append(table).append(" (");
-        sqlBuilder.append(localEntityColumn).append(", ");
-        sqlBuilder.append(peerEntityColumn).append(", ");
-        sqlBuilder.append(principalNameColumn).append(", ");
-        sqlBuilder.append(localIdColumn).append(", ");
-        sqlBuilder.append(persistentIdColumn).append(", ");
-        sqlBuilder.append(peerProvidedIdColumn).append(", ");
-        sqlBuilder.append(createTimeColumn);
-        sqlBuilder.append(") VALUES (?, ?, ?, ?, ?, ?, ?)");
-
-        String sql = sqlBuilder.toString();
-
-        Connection dbConn = dataSource.getConnection();
-        try {
-            log.debug("Storing persistent ID entry based on prepared sql statement: {}", sql);
-            PreparedStatement statement = dbConn.prepareStatement(sql);
-            statement.setQueryTimeout(queryTimeout);
-
-            log.debug("Setting prepared statement parameter {}: {}", 1, entry.getLocalEntityId());
-            statement.setString(1, entry.getLocalEntityId());
-            log.debug("Setting prepared statement parameter {}: {}", 2, entry.getPeerEntityId());
-            statement.setString(2, entry.getPeerEntityId());
-            log.debug("Setting prepared statement parameter {}: {}", 3, entry.getPrincipalName());
-            statement.setString(3, entry.getPrincipalName());
-            log.debug("Setting prepared statement parameter {}: {}", 4, entry.getLocalId());
-            statement.setString(4, entry.getLocalId());
-            log.debug("Setting prepared statement parameter {}: {}", 5, entry.getPersistentId());
-            statement.setString(5, entry.getPersistentId());
-
-            if (entry.getPeerProvidedId() == null) {
-                log.debug("Setting prepared statement parameter {}: {}", 6, Types.VARCHAR);
-                statement.setNull(6, Types.VARCHAR);
-            } else {
-                log.debug("Setting prepared statement parameter {}: {}", 6, entry.getPeerProvidedId());
-                statement.setString(6, entry.getPeerProvidedId());
-            }
-            Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-            log.debug("Setting prepared statement parameter {}: {}", 7, timestamp.toString());
-            statement.setTimestamp(7, timestamp);
-
-            statement.executeUpdate();
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    /**
-     * Deactivates a given persistent ID.
-     * 
-     * @param persistentId ID to deactivate
-     * @param deactivation deactivation time, if null the current time is used
-     * 
-     * @throws SQLException thrown if there is a problem communication with the database
-     */
-    public void deactivatePersistentId(String persistentId, Timestamp deactivation) throws SQLException {
-        Timestamp deactivationTime = deactivation;
-        if (deactivationTime == null) {
-            deactivationTime = new Timestamp(System.currentTimeMillis());
-        }
-
-        Connection dbConn = dataSource.getConnection();
-        try {
-            log.debug("Deactivating persistent id {} as of {}", persistentId, deactivationTime.toString());
-            PreparedStatement statement = dbConn.prepareStatement(deactivateIdSQL);
-            statement.setQueryTimeout(queryTimeout);
-            statement.setTimestamp(1, deactivationTime);
-            statement.setString(2, persistentId);
-            statement.executeUpdate();
-        } finally {
-            try {
-                if (dbConn != null && !dbConn.isClosed()) {
-                    dbConn.close();
-                }
-            } catch (SQLException e) {
-                log.error("Error closing database connection", e);
-            }
-        }
-    }
-
-    /**
-     * Builds a list of {@link PersistentIdEntry}s from a result set.
-     * 
-     * @param resultSet the result set
-     * 
-     * @return list of {@link PersistentIdEntry}s
-     * 
-     * @throws SQLException thrown if there is a problem reading the information from the database
-     */
-    protected List<PersistentIdEntry> buildIdentifierEntries(ResultSet resultSet) throws SQLException {
-        ArrayList<PersistentIdEntry> entries = new ArrayList<PersistentIdEntry>();
-
-        PersistentIdEntry entry;
-        while (resultSet.next()) {
-            entry = new PersistentIdEntry();
-            entry.setLocalEntityId(resultSet.getString(localEntityColumn));
-            entry.setPeerEntityId(resultSet.getString(peerEntityColumn));
-            entry.setPrincipalName(resultSet.getString(principalNameColumn));
-            entry.setPersistentId(resultSet.getString(persistentIdColumn));
-            entry.setLocalId(resultSet.getString(localIdColumn));
-            entry.setPeerProvidedId(resultSet.getString(peerProvidedIdColumn));
-            entry.setCreationTime(resultSet.getTimestamp(createTimeColumn));
-            entry.setDeactivationTime(resultSet.getTimestamp(deactivationTimeColumn));
-            entries.add(entry);
-
-            log.trace("");
-        }
-
-        return entries;
-    }
-
-    /** Data object representing a persistent identifier entry in the database. */
-    public class PersistentIdEntry implements Serializable {
-
-        /** Serial version UID . */
-        private static final long serialVersionUID = -8711779466442306767L;
-
-        /** ID of the entity that issued that identifier. */
-        private String localEntityId;
-
-        /** ID of the entity to which the identifier was issued. */
-        private String peerEntityId;
-
-        /** Name of the principal represented by the identifier. */
-        private String principalName;
-
-        /** Local component portion of the persistent ID entry. */
-        private String localId;
-
-        /** The persistent identifier. */
-        private String persistentId;
-
-        /** ID, associated with the persistent identifier, provided by the peer. */
-        private String peerProvidedId;
-
-        /** Time the identifier was created. */
-        private Timestamp creationTime;
-
-        /** Time the identifier was deactivated. */
-        private Timestamp deactivationTime;
-
-        /** Constructor. */
-        public PersistentIdEntry() {
-        }
-
-        /**
-         * Gets the ID of the entity that issued the identifier.
-         * 
-         * @return ID of the entity that issued the identifier
-         */
-        public String getLocalEntityId() {
-            return localEntityId;
-        }
-
-        /**
-         * Sets the ID of the entity that issued the identifier.
-         * 
-         * @param id ID of the entity that issued the identifier
-         */
-        public void setLocalEntityId(String id) {
-            localEntityId = id;
-        }
-
-        /**
-         * Gets the ID of the entity to which the identifier was issued.
-         * 
-         * @return ID of the entity to which the identifier was issued
-         */
-        public String getPeerEntityId() {
-            return peerEntityId;
-        }
-
-        /**
-         * Sets the ID of the entity to which the identifier was issued.
-         * 
-         * @param id ID of the entity to which the identifier was issued
-         */
-        public void setPeerEntityId(String id) {
-            peerEntityId = id;
-        }
-
-        /**
-         * Gets the name of the principal the identifier represents.
-         * 
-         * @return name of the principal the identifier represents
-         */
-        public String getPrincipalName() {
-            return principalName;
-        }
-
-        /**
-         * Sets the name of the principal the identifier represents.
-         * 
-         * @param name name of the principal the identifier represents
-         */
-        public void setPrincipalName(String name) {
-            principalName = name;
-        }
-
-        /**
-         * Gets the local ID component of the persistent identifier.
-         * 
-         * @return local ID component of the persistent identifier
-         */
-        public String getLocalId() {
-            return localId;
-        }
-
-        /**
-         * Sets the local ID component of the persistent identifier.
-         * 
-         * @param id local ID component of the persistent identifier
-         */
-        public void setLocalId(String id) {
-            localId = id;
-        }
-
-        /**
-         * Gets the persistent identifier.
-         * 
-         * @return the persistent identifier
-         */
-        public String getPersistentId() {
-            return persistentId;
-        }
-
-        /**
-         * Set the persistent identifier.
-         * 
-         * @param id the persistent identifier
-         */
-        public void setPersistentId(String id) {
-            persistentId = id;
-        }
-
-        /**
-         * Gets the ID, provided by the peer, associated with this ID.
-         * 
-         * @return ID, provided by the peer, associated with this ID
-         */
-        public String getPeerProvidedId() {
-            return peerProvidedId;
-        }
-
-        /**
-         * Sets the ID, provided by the peer, associated with this ID.
-         * 
-         * @param id ID, provided by the peer, associated with this ID
-         */
-        public void setPeerProvidedId(String id) {
-            peerProvidedId = id;
-        }
-
-        /**
-         * Gets the time the identifier was created.
-         * 
-         * @return time the identifier was created
-         */
-        public Timestamp getCreationTime() {
-            return creationTime;
-        }
-
-        /**
-         * Sets the time the identifier was created.
-         * 
-         * @param time time the identifier was created
-         */
-        public void setCreationTime(Timestamp time) {
-            creationTime = time;
-        }
-
-        /**
-         * Gets the time the identifier was deactivated.
-         * 
-         * @return time the identifier was deactivated
-         */
-        public Timestamp getDeactivationTime() {
-            return deactivationTime;
-        }
-
-        /**
-         * Sets the time the identifier was deactivated.
-         * 
-         * @param time the time the identifier was deactivated
-         */
-        public void setDeactivationTime(Timestamp time) {
-            this.deactivationTime = time;
-        }
-
-        /** {@inheritDoc} */
-        public String toString() {
-            StringBuilder stringForm = new StringBuilder("PersistentIdEntry{");
-            stringForm.append("persistentId:").append(persistentId).append(", ");
-            stringForm.append("localEntityId:").append(localEntityId).append(", ");
-            stringForm.append("peerEntityId:").append(peerEntityId).append(", ");
-            stringForm.append("localId:").append(localId).append(", ");
-            stringForm.append("principalName:").append(principalName).append(", ");
-            stringForm.append("peerProvidedId:").append(peerProvidedId).append(", ");
-            stringForm.append("creationTime:").append(creationTime).append(", ");
-            stringForm.append("deactivationTime:").append(deactivationTime).append(", ");
-            stringForm.append("}");
-            return stringForm.toString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/TemplateEngine.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/TemplateEngine.java.svn-base
deleted file mode 100644
index bb32939..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/dataConnector/.svn/text-base/TemplateEngine.java.svn-base
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector;
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.resource.util.StringResourceRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ResolutionPlugIn;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.AttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.util.VelocityStringResourceRepositoryAdaptor;
-
-/**
- * A velocity based template engine that pulls information from a resolution context for use within the template.
- */
-public class TemplateEngine {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(TemplateEngine.class);
-
-    /** Velocity engine to use to render templates. */
-    private final VelocityEngine velocity;
-
-    /**
-     * Constructor.
-     * 
-     * @param engine velocity engine used to evaluate templates
-     */
-    public TemplateEngine(VelocityEngine engine) {
-        velocity = engine;
-    }
-
-    /**
-     * Registers a template under a given name.
-     * 
-     * @param templateName name to register the template under
-     * @param template template to register
-     */
-    public void registerTemplate(String templateName, String template) {
-        try {
-            StringResourceRepository repository = VelocityStringResourceRepositoryAdaptor.getRepository(velocity);
-            repository.putStringResource(templateName, template);
-        } catch (VelocityException e) {
-            log.error("Unable to register template into Velocity string repository", e);
-        }
-    }
-
-    /**
-     * Create a statement from a give template by replacing it's macro's with information within the resolution context.
-     * 
-     * @param templateName name of the template
-     * @param resolutionContext the current resolution context
-     * @param dependencies the list of resolution plug-in dependencies that will provider attributes
-     * @param escapingStrategy strategy used to escape values, may be null if no escaping is necessary
-     * 
-     * @return constructed statement
-     * 
-     * @throws AttributeResolutionException thrown if the given template can not be populated because it is malformed or
-     *             the given data connectors or attribute definitions error out during resolution
-     */
-    public String createStatement(String templateName, ShibbolethResolutionContext resolutionContext,
-            List<String> dependencies, CharacterEscapingStrategy escapingStrategy) throws AttributeResolutionException {
-        VelocityContext vContext = createVelocityContext(resolutionContext, dependencies, escapingStrategy);
-
-        try {
-            log.trace("Populating the following {} template", templateName);
-
-            StringWriter output = new StringWriter();
-            Template template = velocity.getTemplate(templateName);
-            template.merge(vContext, output);
-            return output.toString();
-        } catch (Exception e) {
-            log.error("Unable to populate " + templateName + " template", e);
-            throw new AttributeResolutionException("Unable to evaluate template", e);
-        }
-    }
-
-    /**
-     * Creates the velocity context from the given resolution context.
-     * 
-     * @param resolutionContext the resolution context containing the currently resolved attribute information
-     * @param dependencies resolution plug-in dependencies that will provide attributes to the velocity context
-     * @param escapingStrategy strategy used to escape values
-     * 
-     * @return the velocity context to use when evaluating the template
-     * 
-     * @throws AttributeResolutionException thrown if a resolution plugin errors out while resolving its attributes
-     */
-    @SuppressWarnings("unchecked")
-    protected VelocityContext createVelocityContext(ShibbolethResolutionContext resolutionContext,
-            List<String> dependencies, CharacterEscapingStrategy escapingStrategy) throws AttributeResolutionException {
-        log.trace("Populating velocity context");
-        VelocityContext vCtx = new VelocityContext();
-        vCtx.put("requestContext", resolutionContext.getAttributeRequestContext());
-
-        ResolutionPlugIn plugin;
-        Map<String, BaseAttribute> attributes;
-        BaseAttribute attribute;
-        for (String dependencyId : dependencies) {
-            plugin = resolutionContext.getResolvedPlugins().get(dependencyId);
-            if (plugin instanceof DataConnector) {
-                log.trace("Resolving attributes from data connector {}", dependencyId);
-                attributes = ((DataConnector) plugin).resolve(resolutionContext);
-
-                for (String attributeId : attributes.keySet()) {
-                    vCtx.put(attributeId, prepareAttributeValues(attributes.get(attributeId), escapingStrategy));
-                }
-            } else if (plugin instanceof AttributeDefinition) {
-                log.trace("Resolving attributes from attribute definition {}", dependencyId);
-                attribute = ((AttributeDefinition) plugin).resolve(resolutionContext);
-                if (!vCtx.containsKey(attribute.getId())) {
-                    vCtx.put(attribute.getId(), new ArrayList<String>());
-                }
-                ((List<String>) vCtx.get(attribute.getId())).addAll(attribute.getValues());
-            } else {
-                log.trace("Unable to locate resolution plugin {}", dependencyId);
-            }
-        }
-
-        return vCtx;
-    }
-
-    /**
-     * Prepares an attributes values for use within a template.
-     * 
-     * @param attribute attribute whose values are to be prepared
-     * @param escapingStrategy character escaping strategy to be sued
-     * 
-     * @return prepared values
-     */
-    protected List<Object> prepareAttributeValues(BaseAttribute attribute, CharacterEscapingStrategy escapingStrategy) {
-        ArrayList<Object> preparedValues = new ArrayList<Object>();
-
-        if (attribute == null || attribute.getValues() == null || attribute.getValues().isEmpty()) {
-            return preparedValues;
-        }
-
-        if (escapingStrategy == null) {
-            preparedValues.addAll(attribute.getValues());
-        } else {
-            for (Object value : attribute.getValues()) {
-                if(value instanceof String){
-                    preparedValues.add(escapingStrategy.escape(value.toString()));
-                }else{
-                    preparedValues.add(value);
-                }
-            }
-        }
-
-        return preparedValues;
-    }
-
-    /**
-     * Represents a domain specific strategy for escaping values used within a template.
-     */
-    public interface CharacterEscapingStrategy {
-
-        /**
-         * Creates a new string with necessary escaping rules.
-         * 
-         * @param value the value to be escaped
-         * 
-         * @return the escaped string
-         */
-        public String escape(String value);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/all-wcprops
deleted file mode 100644
index 6bf3115..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/all-wcprops
+++ /dev/null
@@ -1,47 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 149
-/java-shib-common/!svn/ver/985/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector
-END
-PrincipalConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 173
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/PrincipalConnector.java
-END
-ContextualPrincipalConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 183
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/ContextualPrincipalConnector.java
-END
-TransientPrincipalConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/TransientPrincipalConnector.java
-END
-CryptoTransientPrincipalConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 188
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/CryptoTransientPrincipalConnector.java
-END
-BasePrincipalConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/BasePrincipalConnector.java
-END
-DirectPrincipalConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 179
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/DirectPrincipalConnector.java
-END
-StoredIDPrincipalConnector.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/985/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/StoredIDPrincipalConnector.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/entries
deleted file mode 100644
index e00d059..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/entries
+++ /dev/null
@@ -1,266 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-07-10T11:33:57.949260Z
-985
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-PrincipalConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.810759Z
-4d2a19de13114c7313ea9d64c5ab4f0a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1803
-

-ContextualPrincipalConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.806759Z
-19f786667ca18a4e0d6a0332a4f9f751
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2664
-

-TransientPrincipalConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.806759Z
-2c059a002535f2d739d62b2a3c9fb273
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4241
-

-CryptoTransientPrincipalConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.806759Z
-1ae02dce6a5cabe8e5d2daa80f5fac16
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6152
-

-BasePrincipalConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.806759Z
-8a1aefd1f495041fbbd7be3e87b1bd1b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1933
-

-DirectPrincipalConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.810759Z
-28702e13ba585b765556c7eb8c2c1c70
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2093
-

-StoredIDPrincipalConnector.java
-file
-
-
-
-
-2014-02-19T17:27:41.810759Z
-54f35f99e88e9b5bcbeb5bf431c05583
-2011-07-10T11:33:57.949260Z
-985
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8635
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/BasePrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/BasePrincipalConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/BasePrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/ContextualPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/ContextualPrincipalConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/ContextualPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/DirectPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/DirectPrincipalConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/DirectPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/PrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/PrincipalConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/PrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/StoredIDPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/StoredIDPrincipalConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/StoredIDPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/TransientPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/TransientPrincipalConnector.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/prop-base/TransientPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/BasePrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/BasePrincipalConnector.java.svn-base
deleted file mode 100644
index b0e593a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/BasePrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.AbstractResolutionPlugIn;
-
-
-/**
- * Base class for {@link PrincipalConnector} plug-ins.
- */
-public abstract class BasePrincipalConnector extends AbstractResolutionPlugIn<String> implements
-        PrincipalConnector {
-    
-    /** NameID Format. */
-    private String format;
-
-    /** Relying parties this connector is valid for. */
-    private Set<String> relyingParties;
-
-    /** Constructor. */
-    public BasePrincipalConnector() {
-        relyingParties = new HashSet<String>();
-    }
-
-    /**
-     * Set NameID format.
-     * 
-     * @param newFormat new NameID format
-     */
-    public void setFormat(String newFormat) {
-        format = newFormat;
-    }
-
-    /** {@inheritDoc} */
-    public String getFormat() {
-        return format;
-    }
-
-    /** {@inheritDoc} */
-    public Set<String> getRelyingParties() {
-        return relyingParties;
-    }  
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/ContextualPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/ContextualPrincipalConnector.java.svn-base
deleted file mode 100644
index b260942..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/ContextualPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector;
-
-import java.util.List;
-import java.util.Set;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Wrapper for a {@link PrincipalConnector} within a resolution context. This wrapper ensures that the connector is
- * resolved only once per context.
- */
-public class ContextualPrincipalConnector implements PrincipalConnector {
-
-    /** Wrapped principal connector. */
-    private PrincipalConnector connector;
-
-    /** Cached result of resolving the connector. */
-    private String principal;
-
-    /**
-     * Constructor.
-     * 
-     * @param newConnector principal connector to wrap
-     */
-    public ContextualPrincipalConnector(PrincipalConnector newConnector) {
-        this.connector = newConnector;
-    }
-
-    /** {@inheritDoc} */
-    public List<String> getDependencyIds() {
-        return connector.getDependencyIds();
-    }
-
-    /** {@inheritDoc} */
-    public String getFormat() {
-        return connector.getFormat();
-    }
-
-    /** {@inheritDoc} */
-    public String getId() {
-        return connector.getId();
-    }
-
-    /** {@inheritDoc} */
-    public Set<String> getRelyingParties() {
-        return connector.getRelyingParties();
-    }
-
-    /** {@inheritDoc} */
-    public String resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        if (principal == null) {
-            principal = connector.resolve(resolutionContext);
-        }
-
-        return principal;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        connector.validate();
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/CryptoTransientPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/CryptoTransientPrincipalConnector.java.svn-base
deleted file mode 100644
index 5851c4f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/CryptoTransientPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector;
-
-import org.opensaml.common.SAMLObject;
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.saml2.core.NameID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.util.DataExpiredException;
-import edu.internet2.middleware.shibboleth.common.util.DataSealer;
-import edu.internet2.middleware.shibboleth.common.util.DataSealerException;
-
-/**
- * A principal connector that attempts to look up a name identifier within a store.
- */
-public class CryptoTransientPrincipalConnector extends BasePrincipalConnector {
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(CryptoTransientPrincipalConnector.class);
-
-    /** Object used to protect and encrypt the data. */
-    private DataSealer dataSealer;
-    
-    /**
-     * Constructor.
-     * 
-     * @param sealer object used to protect and encrypt the data
-     */
-    public CryptoTransientPrincipalConnector(DataSealer sealer) {
-        if (sealer == null) {
-            throw new IllegalArgumentException("DataSealer may not be null.");
-        }
-        dataSealer = sealer;
-    }
-
-    /** {@inheritDoc} */
-    public String resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        SAMLProfileRequestContext<?, ?, ?, ?> requestContext = resolutionContext.getAttributeRequestContext();
-
-        String transientId = null;
-        String nameQualifier = null;
-        String spNameQualifier = null;
-        SAMLObject subjectId = requestContext.getSubjectNameIdentifier();
-        if (subjectId instanceof NameIdentifier) {
-            NameIdentifier nameId = (NameIdentifier) requestContext.getSubjectNameIdentifier();
-            if (nameId != null) {
-                transientId = nameId.getNameIdentifier();
-                nameQualifier = nameId.getNameQualifier();
-            }
-        } else if (requestContext.getSubjectNameIdentifier() instanceof NameID) {
-            NameID nameId = (NameID) requestContext.getSubjectNameIdentifier();
-            if (nameId != null) {
-                transientId = nameId.getValue();
-                nameQualifier = nameId.getNameQualifier();
-                spNameQualifier = nameId.getSPNameQualifier();
-            }
-        } else {
-            throw new AttributeResolutionException("Subject name identifier is not of a supported type");
-        }
-
-        if (transientId == null) {
-            throw new AttributeResolutionException("Invalid subject name identifier");
-        }
-
-        String decodedId;
-        try {
-            decodedId = dataSealer.unwrap(transientId);
-        } catch (DataExpiredException e) {
-            throw new AttributeResolutionException("Principal identifier has expired.");
-        } catch (DataSealerException e) {
-            throw new AttributeResolutionException("Caught exception unwrapping principal identifier.", e);
-        }
-        
-        if (decodedId == null) {
-            throw new AttributeResolutionException("Unable to recover principal from transient identifier: "
-                    + transientId);
-        }
-        
-        // Split the identifier.
-        String[] parts = decodedId.split("!");
-        if (parts.length != 3) {
-            throw new AttributeResolutionException("Decoded principal information was invalid: "
-                    + decodedId);
-        }
-        
-        if (nameQualifier != null && !nameQualifier.equals(parts[0])) {
-            throw new AttributeResolutionException("Decoded NameQualifier (" + nameQualifier +
-                    ") does not match supplied value (" + parts[0] + ").");
-        } else if (spNameQualifier != null && !spNameQualifier.equals(parts[1])) {
-            throw new AttributeResolutionException("Decoded SPNameQualifier (" + spNameQualifier +
-                    ") does not match supplied value (" + parts[1] + ").");
-        } else if (!parts[0].equals(requestContext.getOutboundMessageIssuer())) {
-            throw new AttributeResolutionException("Decoded NameQualifier (" + parts[0] +
-                    ") does not match issuer (" + requestContext.getOutboundMessageIssuer() + ").");
-        } else if (!parts[1].equals(requestContext.getInboundMessageIssuer())) {
-            throw new AttributeResolutionException("Decoded SPNameQualifier (" + parts[0] +
-                    ") does not match requester (" + requestContext.getInboundMessageIssuer() + ").");
-        }
-
-        return parts[2];
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if (dataSealer == null) {
-            log.error("CryptoTransientPrincipalConnector (" + getId()
-                    + ") must have a DataSealer object set.");
-            throw new AttributeResolutionException("CryptoTransientPrincipalConnector (" + getId()
-                    + ") must have a DataSealer object set.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/DirectPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/DirectPrincipalConnector.java.svn-base
deleted file mode 100644
index 4ea95df..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/DirectPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector;
-
-import org.opensaml.common.SAMLObject;
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.saml2.core.NameID;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-
-/**
- * Principal connector that uses the SAML name identifier value as the principal name.
- */
-public class DirectPrincipalConnector extends BasePrincipalConnector {
-
-    /** {@inheritDoc} */
-    public String resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        SAMLObject nameIdentifier = resolutionContext.getAttributeRequestContext().getSubjectNameIdentifier();
-
-        if (nameIdentifier instanceof NameIdentifier) {
-            return ((NameIdentifier) nameIdentifier).getNameIdentifier();
-        } else if (nameIdentifier instanceof NameID) {
-            return ((NameID) nameIdentifier).getValue();
-        } else {
-            return null;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/PrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/PrincipalConnector.java.svn-base
deleted file mode 100644
index 982f3cb..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/PrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector;
-
-import java.util.Set;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ResolutionPlugIn;
-
-/**
- * Principal connectors are responsible for taking subject's SAML name identifier and converting it into a string based
- * principal (user) name.
- * 
- * This plugin and all its dependencies are guarenteed to run prior to the attribute definitions meant to provide
- * attributes about the user, such that those definitions and data connectors will have access to a principal name.
- */
-public interface PrincipalConnector extends ResolutionPlugIn<String> {
-
-    /**
-     * Get NamID format.
-     * 
-     * @return the NameID format
-     */
-    public String getFormat();
-
-    /**
-     * Get relying parties this connector is valid for.
-     * 
-     * @return set of relying parties
-     */
-    public Set<String> getRelyingParties();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/StoredIDPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/StoredIDPrincipalConnector.java.svn-base
deleted file mode 100644
index 28a426e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/StoredIDPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector;
-
-import java.sql.SQLException;
-
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.saml2.core.AuthnRequest;
-import org.opensaml.saml2.core.NameID;
-import org.opensaml.saml2.core.SubjectQuery;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StoredIDDataConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StoredIDStore;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StoredIDStore.PersistentIdEntry;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-
-/**
- * A principal connector that resolved ID created by {@link StoredIDPrincipalConnector}s into principals.
- */
-public class StoredIDPrincipalConnector extends BasePrincipalConnector {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StoredIDPrincipalConnector.class);
-
-    /** ID store that manages the stored IDs. */
-    private StoredIDStore pidStore;
-
-    /** Whether an empty result set is an error. */
-    private boolean noResultIsError;
-
-    /**
-     * Constructor.
-     * 
-     * @param idProducer data connector that produced the stored ID.
-     */
-    public StoredIDPrincipalConnector(StoredIDDataConnector idProducer) {
-        if (idProducer == null) {
-            throw new IllegalArgumentException("ID producing data connector may not be null");
-        }
-        pidStore = idProducer.getStoredIDStore();
-        noResultIsError = false;
-    }
-
-    /**
-     * This returns whether this connector will throw an exception if no search results are found. The default is false.
-     * 
-     * @return <code>boolean</code>
-     */
-    public boolean isNoResultIsError() {
-        return noResultIsError;
-    }
-
-    /**
-     * This sets whether this connector will throw an exception if no search results are found.
-     * 
-     * @param isError <code>boolean</code>
-     */
-    public void setNoResultIsError(boolean isError) {
-        noResultIsError = isError;
-    }
-
-    /** {@inheritDoc} */
-    public String resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        SAMLProfileRequestContext requestContext = resolutionContext.getAttributeRequestContext();
-
-        String persistentId;
-        if (requestContext.getSubjectNameIdentifier() instanceof NameIdentifier) {
-            persistentId = ((NameIdentifier) requestContext.getSubjectNameIdentifier()).getNameIdentifier();
-        } else if (requestContext.getSubjectNameIdentifier() instanceof NameID) {
-            persistentId = ((NameID) requestContext.getSubjectNameIdentifier()).getValue();
-        } else {
-            throw new AttributeResolutionException("Subject name identifier is not of a supported type");
-        }
-
-        try {
-            PersistentIdEntry pidEntry = pidStore.getActivePersistentIdEntry(persistentId);
-            if (pidEntry == null) {
-                if (noResultIsError) {
-                    log.warn("PersistentId '{}' not found", persistentId);
-                    throw new AttributeResolutionException("No identifier found");
-                }
-                return null;
-            }
-
-            if (!DatatypeHelper.safeEquals(pidEntry.getPeerEntityId(), getPeerEntityId(resolutionContext))) {
-                log.warn(
-                        "Requester '{}' attempted to use identifier '{}' which was issued to the entity '{}'",
-                        new Object[] {requestContext.getInboundMessageIssuer(), pidEntry.getPersistentId(),
-                                pidEntry.getPeerEntityId(),});
-                if (noResultIsError) {
-                    throw new AttributeResolutionException("identifier mismatch");
-                }
-                return null;
-            }
-
-            return pidEntry.getPrincipalName();
-        } catch (SQLException e) {
-            log.error("Error retrieving persistent ID from database", e);
-            throw new AttributeResolutionException("Error retrieving persistent ID from database", e);
-        }
-
-    }
-
-    /**
-     * Gets the entity ID used for the peer. If the inbound request is a SAML 2 authentication context and contains a
-     * NameIDPolicy than the SPNameQualifier is used if present, otherwise the inbound message issuer is used.
-     * 
-     * @param resolutionContext current attribute resolution context
-     * 
-     * @return the entity ID to use for the peer
-     */
-    protected String getPeerEntityId(ShibbolethResolutionContext resolutionContext) {
-        SAMLProfileRequestContext requestContext = resolutionContext.getAttributeRequestContext();
-        
-        String peerEntityId = null;
-
-        log.debug("Determining if peer entity ID will be the SPNameQualifier from a SAML 2 authentication statement");
-        XMLObject inboundMessage = requestContext.getInboundSAMLMessage();
-        if (inboundMessage instanceof AuthnRequest) {
-            AuthnRequest authnRequest = (AuthnRequest) inboundMessage;
-            if (authnRequest.getNameIDPolicy() != null) {
-                peerEntityId = DatatypeHelper.safeTrimOrNullString(authnRequest.getNameIDPolicy().getSPNameQualifier());
-                if (peerEntityId == null) {
-                    log.debug("SAML 2 authentication request did not contain an SPNameQualifier within its NameIDPolicy");
-                } else {
-                    log.debug("SAML 2 authentication request contained an SPNameQualifier, within its NameIDPolicy.  Using that as peer entity ID");
-                }
-            } else {
-                log.debug("SAML 2 authentication request did not contain a NameIDPolicy");
-            }
-        } else if (inboundMessage instanceof SubjectQuery) {
-            SubjectQuery query = (SubjectQuery) inboundMessage;
-            if (query.getSubject().getNameID().getSPNameQualifier() != null) {
-                peerEntityId =
-                        DatatypeHelper.safeTrimOrNullString(query.getSubject().getNameID().getSPNameQualifier());
-                if (peerEntityId == null) {
-                    log.debug("SAML 2 subject query did not contain an SPNameQualifier within its NameID");
-                } else {
-                    log.debug("SAML 2 subject query contained an SPNameQualifier, within its NameID.  Using that as peer entity ID");
-                }
-            } else {
-                log.debug("SAML 2 attribute query did not contain a SPNameQualifier");
-            }
-        } else {
-            peerEntityId = requestContext.getInboundMessageIssuer(); 
-        }
-
-        if (peerEntityId == null) {
-            log.debug("Determining if inbound message issuer is available for use as peer entity ID");
-            peerEntityId = resolutionContext.getAttributeRequestContext().getInboundMessageIssuer();
-        }
-
-        return peerEntityId;
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-        if (pidStore == null) {
-            throw new AttributeResolutionException("Persistent ID store was null");
-        }
-
-        try {
-            pidStore.getPersistentIdEntry("test", false);
-        } catch (SQLException e) {
-            throw new AttributeResolutionException("Persistent ID store can not perform persistent ID search", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/TransientPrincipalConnector.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/TransientPrincipalConnector.java.svn-base
deleted file mode 100644
index 511f223..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/principalConnector/.svn/text-base/TransientPrincipalConnector.java.svn-base
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector;
-
-import org.opensaml.common.SAMLObject;
-import org.opensaml.saml1.core.NameIdentifier;
-import org.opensaml.saml2.core.NameID;
-import org.opensaml.util.storage.StorageService;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.TransientIdEntry;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-
-/**
- * A principal connector that attempts to look up a name identifier within a store.
- */
-public class TransientPrincipalConnector extends BasePrincipalConnector {
-
-    /** Store used to map transient identifier tokens to principal names. */
-    private StorageService<String, TransientIdEntry> identifierStore;
-
-    /** Storage partition in which IDs are stored. */
-    private String partition;
-
-    /**
-     * Constructor.
-     * 
-     * @param store the backing store used to map transient identifier tokens to principal names
-     */
-    public TransientPrincipalConnector(StorageService<String, TransientIdEntry> store) {
-        if (store == null) {
-            throw new IllegalArgumentException("Identifier store may not be null");
-        }
-        identifierStore = store;
-        partition = "transientId";
-    }
-
-    /** {@inheritDoc} */
-    public String resolve(ShibbolethResolutionContext resolutionContext) throws AttributeResolutionException {
-        SAMLProfileRequestContext requestContext = resolutionContext.getAttributeRequestContext();
-
-        String transientId = null;
-        SAMLObject subjectId = requestContext.getSubjectNameIdentifier();
-        if (subjectId instanceof NameIdentifier) {
-            NameIdentifier nameId = (NameIdentifier) requestContext.getSubjectNameIdentifier();
-            if (nameId != null) {
-                transientId = nameId.getNameIdentifier();
-            }
-        } else if (requestContext.getSubjectNameIdentifier() instanceof NameID) {
-            NameID nameId = (NameID) requestContext.getSubjectNameIdentifier();
-            if (nameId != null) {
-                transientId = nameId.getValue();
-            }
-        } else {
-            throw new AttributeResolutionException("Subject name identifier is not of a supported type");
-        }
-
-        if (transientId == null) {
-            throw new AttributeResolutionException("Invalid subject name identifier");
-        }
-
-        TransientIdEntry idToken = identifierStore.get(partition, transientId);
-        if (idToken == null || idToken.isExpired()) {
-            throw new AttributeResolutionException("No information associated with transient identifier: "
-                    + transientId);
-        }
-
-        if (!idToken.getRelyingPartyId().equals(requestContext.getInboundMessageIssuer())) {
-            throw new AttributeResolutionException("Transient identifier was issued to " + idToken.getRelyingPartyId()
-                    + " but is being used by " + requestContext.getInboundMessageIssuer());
-        }
-
-        return idToken.getPrincipalName();
-    }
-
-    /** {@inheritDoc} */
-    public void validate() throws AttributeResolutionException {
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/binding/.svn/all-wcprops
deleted file mode 100644
index 3de5016..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/binding
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/binding/.svn/entries
deleted file mode 100644
index da4a875..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/binding
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-security
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/all-wcprops
deleted file mode 100644
index 2fe87f9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 119
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security
-END
-ShibbolethClientCertAuthRule.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/ShibbolethClientCertAuthRule.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/entries
deleted file mode 100644
index 27e4481..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibbolethClientCertAuthRule.java
-file
-
-
-
-
-2014-02-19T17:27:45.794838Z
-9c93d90a1a95edb2482f23c866f31218
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2789
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/prop-base/ShibbolethClientCertAuthRule.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/prop-base/ShibbolethClientCertAuthRule.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/prop-base/ShibbolethClientCertAuthRule.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/text-base/ShibbolethClientCertAuthRule.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/text-base/ShibbolethClientCertAuthRule.java.svn-base
deleted file mode 100644
index b391dba..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/text-base/ShibbolethClientCertAuthRule.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.binding.security;
-
-import java.util.Set;
-
-import org.opensaml.common.binding.security.SAMLMDClientCertAuthRule;
-import org.opensaml.ws.security.provider.CertificateNameOptions;
-import org.opensaml.xml.security.trust.TrustEngine;
-import org.opensaml.xml.security.x509.X500DNHandler;
-import org.opensaml.xml.security.x509.X509Credential;
-import org.opensaml.xml.security.x509.X509Util;
-
-/**
- * Specialization of {@link SAMLMDClientCertAuthRule} which may include Shibboleth-specific
- * method overrides for client certificate authentication processing.
- */
-public class ShibbolethClientCertAuthRule extends SAMLMDClientCertAuthRule {
-
-    /**
-     * Constructor.
-     *
-     * @param engine Trust engine used to verify the request X509Credential
-     * @param nameOptions options for deriving issuer names from an X.509 certificate
-     */
-    public ShibbolethClientCertAuthRule(TrustEngine<X509Credential> engine, CertificateNameOptions nameOptions) {
-        super(engine, nameOptions);
-    }
-    
-    /**
-     * Constructor.  The certificate name issuer derivation options are defaulted
-     * to be consistent with the Shibboleth 1.3 identity provider.
-     *
-     * @param engine Trust engine used to verify the request X509Credential
-     */
-    public ShibbolethClientCertAuthRule(TrustEngine<X509Credential> engine) {
-        super(engine, new CertificateNameOptions());
-        
-        CertificateNameOptions nameOptions = getCertificateNameOptions();
-        
-        // This is the behavior used by the Shibboleth 1.3 IdP.
-        nameOptions.setX500SubjectDNFormat(X500DNHandler.FORMAT_RFC2253);
-        nameOptions.setEvaluateSubjectDN(true);
-        nameOptions.setEvaluateSubjectCommonName(true);
-        Set<Integer> altNameTypes = nameOptions.getSubjectAltNames();
-        altNameTypes.add(X509Util.DNS_ALT_NAME);
-        altNameTypes.add(X509Util.URI_ALT_NAME);
-    }
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops
deleted file mode 100644
index f66637b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config
-END
-OpensamlConfigBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/OpensamlConfigBean.java
-END
-BaseService.java
-K 25
-svn:wc:ra_dav:version-url
-V 126
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/BaseService.java
-END
-SpringConfigurationUtils.java
-K 25
-svn:wc:ra_dav:version-url
-V 140
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtils.java
-END
-BaseReloadableService.java
-K 25
-svn:wc:ra_dav:version-url
-V 136
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/BaseReloadableService.java
-END
-BaseSpringNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/BaseSpringNamespaceHandler.java
-END
-SpringDocumentLoader.java
-K 25
-svn:wc:ra_dav:version-url
-V 135
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/SpringDocumentLoader.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/entries
deleted file mode 100644
index 4732fbd..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/entries
+++ /dev/null
@@ -1,253 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-metadata
-dir
-

-profile
-dir
-

-service
-dir
-

-attribute
-dir
-

-BaseReloadableService.java
-file
-
-
-
-
-2014-02-19T17:27:45.222826Z
-5154d1b3be6898af34b9fd723494301e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7785
-

-resource
-dir
-

-security
-dir
-

-BaseSpringNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:45.222826Z
-776ebdb59032bb2c6196acb71422ea2c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7983
-

-SpringDocumentLoader.java
-file
-
-
-
-
-2014-02-19T17:27:45.222826Z
-568aa4d5291eb97648014533ab06f85a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3557
-

-relyingparty
-dir
-

-OpensamlConfigBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.222826Z
-0fb6c5c31d5492ac4d9bb5f3bf0cbc2d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3104
-

-BaseService.java
-file
-
-
-
-
-2014-02-19T17:27:45.222826Z
-b410b54be8faf9312a20dca3e7e3d3be
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8860
-

-SpringConfigurationUtils.java
-file
-
-
-
-
-2014-02-19T17:27:45.222826Z
-54ea23c7b039c460a4a0d7f8cd347f5e
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12014
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseReloadableService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseReloadableService.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseReloadableService.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseService.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseService.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseSpringNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseSpringNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseSpringNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/OpensamlConfigBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/OpensamlConfigBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/OpensamlConfigBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringConfigurationUtils.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringConfigurationUtils.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringConfigurationUtils.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringDocumentLoader.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringDocumentLoader.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringDocumentLoader.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseReloadableService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseReloadableService.java.svn-base
deleted file mode 100644
index ac32d2e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseReloadableService.java.svn-base
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import java.util.Timer;
-
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.resource.ResourceChangeListener;
-import org.opensaml.util.resource.ResourceChangeWatcher;
-import org.opensaml.util.resource.ResourceException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.service.ReloadableService;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/**
- * An extension to {@link BaseService} that allows the service's context to be reloaded if the underlying configuration
- * resources are changed.
- * 
- * If, at construction time, polling frequency and retry attempt are given then the configuration resources will be
- * watched for changes. If a change is detected then the current service's context will be dropped and a new one created
- * from all resource files. If there is a problem loading a configuration resource during this process the existing
- * service context is kept and an error is logged. The result of this occuring during the initial configuration load is
- * implementation dependent.
- * 
- * <strong>NOTE:</strong> Service implementations must take out a read lock, through {@link #getReadWriteLock()},
- * whenever reading or operating on information controlled by the service context. This will ensure that if a
- * configuration change occurs the service context will not be replaced until after all current reads have completed.
- */
-public abstract class BaseReloadableService extends BaseService implements ReloadableService {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseReloadableService.class);
-
-    /** Frequency policy resources are polled for updates.*/
-    private long resourcePollingFrequency;
-
-    /** Number of policy resource polling retry attempts. */
-    private int resourcePollingRetryAttempts;
-
-    /** Timer used to schedule resource polling tasks. */
-    private Timer pollingTimer;
-
-    /**
-     * Constructor. Configuration resources are not monitored for changes.
-     * 
-     * Sets polling frequency to 0 and retry attempts to 0.
-     */
-    public BaseReloadableService() {
-        super();
-        setPollingFrequency(0);
-        setPollingRetryAttempts(0);
-    }
-    
-    /**
-     * Gets the timer used to resource polling jobs.
-     * 
-     * @return timer used to resource polling jobs
-     */
-    public Timer getPollingTimer(){
-        return pollingTimer;
-    }
-   
-    /**
-     * Sets the timer used to resource polling jobs.
-     * 
-     * @param timer timer used to resource polling jobs
-     */
-    public void setPollingTimer(Timer timer){
-        pollingTimer = timer;
-    }
-
-    /**
-     * Gets the frequency, in milliseconds, that the configuration resources are polled.
-     * 
-     * @return frequency, in milliseconds, that the configuration resources are polled
-     */
-    public long getPollingFrequency() {
-        return resourcePollingFrequency;
-    }
-    
-    /**
-     * Sets the frequency, in milliseconds, that the configuration resources are polled.
-     * 
-     * @param frequency the frequency, in milliseconds, that the configuration resources are polled
-     */
-    public void setPollingFrequency(long frequency){
-        resourcePollingFrequency = frequency;
-    }
-
-    /**
-     * Gets the number of times a resource may error out before it is considered permanently invalid.
-     * 
-     * @return number of times a resource may error out before it is considered permanently invalid
-     */
-    public int getPollingRetryAttempts() {
-        return resourcePollingRetryAttempts;
-    }
-
-    /**
-     * Sets the number of times a resource may error out before it is considered permanently invalid.
-     * 
-     * @param attempts number of times a resource may error out before it is considered permanently invalid
-     */
-    public void setPollingRetryAttempts(int attempts) {
-        resourcePollingRetryAttempts = attempts;
-    }
-
-    /** {@inheritDoc} */
-    public void initialize() throws ServiceException {
-        if (isDestroyed()) {
-            throw new SecurityException(getId() + " service has been destroyed, it may not be initialized.");
-        }
-
-        if (isInitialized()) {
-            return;
-        }
-
-        try {
-            log.debug("Initializing {} service with resources: {}", getId(), getServiceConfigurations());
-            if (resourcePollingFrequency > 0) {
-                ResourceChangeWatcher changeWatcher;
-                ResourceChangeListener changeListener = new ConfigurationResourceListener();
-                for (Resource configurationResournce : getServiceConfigurations()) {
-                    changeWatcher = new ResourceChangeWatcher(configurationResournce, resourcePollingFrequency,
-                            resourcePollingRetryAttempts);
-                    changeWatcher.getResourceListeners().add(changeListener);
-                    pollingTimer.schedule(changeWatcher, resourcePollingFrequency, resourcePollingFrequency);
-                }
-            }
-            
-            loadContext();
-        } catch (ResourceException e) {
-            throw new ServiceException("Unable to initialize service: " + getId(), e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void reload() throws ServiceException {
-        log.debug("Reloading service {}", getId());
-        loadContext();
-        log.info("{} service configuration reloaded", getId());
-    }
-
-    /** {@inheritDoc} */
-    public void destroy() throws ServiceException {
-        pollingTimer.cancel();
-        super.destroy();
-    }
-
-    /** A listener for policy resource changes that triggers a reloading of the AFP context. */
-    protected class ConfigurationResourceListener implements ResourceChangeListener {
-
-        /** {@inheritDoc} */
-        public void onResourceCreate(Resource resource) {
-            try {
-                loadContext();
-            } catch (ServiceException e) {
-                log.error(
-                        "Error reloading configuration, upon configuration resource creation, for service " + getId(),
-                        e);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public void onResourceDelete(Resource resource) {
-            try {
-                loadContext();
-            } catch (ServiceException e) {
-                log.error(
-                        "Error reloading configuration, upon configuration resource deletion, for service " + getId(),
-                        e);
-            }
-        }
-
-        /** {@inheritDoc} */
-        public void onResourceUpdate(Resource resource) {
-            try {
-                loadContext();
-            } catch (ServiceException e) {
-                log.error("Error reloading configuration, upon configuration resource update, for service " + getId(),
-                        e);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseService.java.svn-base
deleted file mode 100644
index 307e619..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseService.java.svn-base
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.opensaml.util.resource.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.support.GenericApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.service.Service;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/**
- * A service whose Spring beans are loaded into a service specific {@link ApplicationContext} that is a child of the
- * context provided in {@link #setApplicationContext(ApplicationContext)}.
- * 
- * Services derived from this base class may not be re-initialized after they have been destroyed.
- */
-public abstract class BaseService implements Service, ApplicationContextAware, BeanNameAware {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseService.class);
-
-    /** Unique name of this service. */
-    private String serviceName;
-
-    /** Read/Write lock for the context. */
-    private ReentrantReadWriteLock serviceContextRWLock;
-
-    /** Application context owning this engine. */
-    private ApplicationContext owningContext;
-
-    /** Context containing loaded with service content. */
-    private GenericApplicationContext serviceContext;
-
-    /** List of configuration resources for this service. */
-    private ArrayList<Resource> serviceConfigurations;
-
-    /** Indicates if the service has been initialized already. */
-    private boolean isInitialized;
-
-    /** Indicates if the service has been destroyed. */
-    private boolean isDestroyed;
-
-    /** Constructor. */
-    public BaseService() {
-        serviceContextRWLock = new ReentrantReadWriteLock(true);
-        isInitialized = false;
-    }
-
-    /** {@inheritDoc} */
-    public void destroy() throws ServiceException {
-        Lock writeLock = getReadWriteLock().writeLock();
-        writeLock.lock();
-        isDestroyed = true;
-        serviceContext = null;
-        serviceConfigurations.clear();
-        setInitialized(false);
-        writeLock.unlock();
-        serviceContextRWLock = null;
-    }
-
-    /**
-     * Gets the application context that is the parent to this service's context.
-     * 
-     * @return application context that is the parent to this service's context
-     */
-    public ApplicationContext getApplicationContext() {
-        return owningContext;
-    }
-
-    /** {@inheritDoc} */
-    public String getId() {
-        return serviceName;
-    }
-    
-    /**
-     * Gets the read-write lock guarding the service context.
-     * 
-     * @return read-write lock guarding the service context
-     */
-    protected ReadWriteLock getReadWriteLock() {
-        return serviceContextRWLock;
-    }
-    
-    /**
-     * Gets an unmodifiable list of configurations for this service.
-     * 
-     * @return unmodifiable list of configurations for this service
-     */
-    public List<Resource> getServiceConfigurations(){
-        return Collections.unmodifiableList(serviceConfigurations);
-    }
-
-    /**
-     * Gets this service's context.
-     * 
-     * @return this service's context
-     */
-    public ApplicationContext getServiceContext() {
-        return serviceContext;
-    }
-
-    /** {@inheritDoc} */
-    public void initialize() throws ServiceException {
-        if (isDestroyed()) {
-            throw new SecurityException(getId() + " service has been destroyed, it may not be initialized.");
-        }
-
-        if (isInitialized()) {
-            return;
-        }
-        
-        loadContext();
-    }
-
-    /** {@inheritDoc} */
-    public boolean isInitialized() {
-        return isInitialized;
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isDestroyed() {
-        return isDestroyed;
-    }
-
-    /**
-     * Loads the service context.
-     * 
-     * @throws ServiceException thrown if the configuration for this service could not be loaded
-     */
-    protected void loadContext() throws ServiceException {
-        log.info("Loading new configuration for service {}", getId());
-        
-        if(serviceConfigurations == null || serviceConfigurations.isEmpty()){
-            setInitialized(true);
-            return;
-        }
-        
-        GenericApplicationContext newServiceContext = new GenericApplicationContext(getApplicationContext());
-        newServiceContext.setDisplayName("ApplicationContext:" + getId());
-        Lock writeLock = getReadWriteLock().writeLock();
-        writeLock.lock();
-        try {
-            SpringConfigurationUtils.populateRegistry(newServiceContext, getServiceConfigurations());
-            newServiceContext.refresh();
-
-            GenericApplicationContext replacedServiceContext = serviceContext;
-            onNewContextCreated(newServiceContext);
-            setServiceContext(newServiceContext);
-            setInitialized(true);
-            if(replacedServiceContext != null){
-                replacedServiceContext.close();
-            }
-            log.info("{} service loaded new configuration", getId());
-        } catch (Throwable e) {
-            // Here we catch all the other exceptions thrown by Spring when it starts up the context
-            setInitialized(false);
-            Throwable rootCause = e;
-            while (rootCause.getCause() != null) {
-                rootCause = rootCause.getCause();
-            }
-            log.error("Configuration was not loaded for " + getId()
-                    + " service, error creating components.  The root cause of this error was: " +
-                    rootCause.getClass().getCanonicalName() + ": " + rootCause.getMessage());
-            log.trace("Full stacktrace is: ", e);
-            throw new ServiceException("Configuration was not loaded for " + getId()
-                    + " service, error creating components.", rootCause);
-        }finally{
-            writeLock.unlock();
-        }
-    }
-
-    /**
-     * Called after a new context has been created but before it set as the service's context. If an exception is thrown
-     * the new context will not be set as the service's context and the current service context will be retained.
-     * 
-     * @param newServiceContext the newly created context for the service
-     * 
-     * @throws ServiceException thrown if there is a problem with the given service context
-     */
-    protected abstract void onNewContextCreated(ApplicationContext newServiceContext) throws ServiceException;
-
-    /**
-     * Sets the application context that is the parent to this service's context.
-     * 
-     * {@inheritDoc}
-     */
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        owningContext = applicationContext;
-    }
-
-    /** {@inheritDoc} */
-    public void setBeanName(String name) {
-        serviceName = name;
-    }
-
-    /**
-     * Sets whether this service has been initialized.
-     * 
-     * @param initialized whether this service has been initialized
-     */
-    protected void setInitialized(boolean initialized) {
-        isInitialized = initialized;
-    }
-
-    /**
-     * Sets the service's configuration resources.
-     * 
-     * @param configurations configuration resources for the service
-     */
-    public void setServiceConfigurations(List<Resource> configurations) {
-        if(isInitialized){
-            throw new IllegalStateException("Service already initialized");
-        }
-        serviceConfigurations = new ArrayList<Resource>(configurations);
-    }
-
-    /**
-     * Sets this service's context.
-     * 
-     * @param context this service's context
-     */
-    protected void setServiceContext(GenericApplicationContext context) {
-        serviceContext = context;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseSpringNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseSpringNamespaceHandler.java.svn-base
deleted file mode 100644
index 304e948..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseSpringNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.xml.BeanDefinitionDecorator;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.NamespaceHandler;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * A base class for {@link NamespaceHandler} implementations.
- * 
- * This code is heavily based on Spring's <code>NamespaceHandlerSupport</code>. The largest difference is that bean
- * definition parsers may be registered against either an elements name or schema type. During parser lookup the schema
- * type is preferred.
- */
-public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseSpringNamespaceHandler.class);
-
-    /**
-     * Stores the {@link BeanDefinitionParser} implementations keyed by the local name of the {@link Element Elements}
-     * they handle.
-     */
-    private Map<QName, BeanDefinitionParser> parsers = new HashMap<QName, BeanDefinitionParser>();
-
-    /**
-     * Stores the {@link BeanDefinitionDecorator} implementations keyed by the local name of the
-     * {@link Element Elements} they handle.
-     */
-    private Map<QName, BeanDefinitionDecorator> decorators = new HashMap<QName, BeanDefinitionDecorator>();
-
-    /**
-     * Stores the {@link BeanDefinitionParser} implementations keyed by the local name of the {@link Attr Attrs} they
-     * handle.
-     */
-    private Map<QName, BeanDefinitionDecorator> attributeDecorators = new HashMap<QName, BeanDefinitionDecorator>();
-
-    /**
-     * Decorates the supplied {@link Node} by delegating to the {@link BeanDefinitionDecorator} that is registered to
-     * handle that {@link Node}.
-     * 
-     * @param node the node decorating a the given bean definition
-     * @param definition the bean being decorated
-     * @param parserContext the current parser context
-     * 
-     * @return the deocrated bean definition
-     */
-    public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
-        return findDecoratorForNode(node).decorate(node, definition, parserContext);
-    }
-
-    /**
-     * Parses the supplied {@link Element} by delegating to the {@link BeanDefinitionParser} that is registered for that
-     * {@link Element}.
-     * 
-     * @param element the element to be parsed into a bean definition
-     * @param parserContext the context within which the bean definition is created
-     * 
-     * @return the bean definition created from the given element
-     */
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        return findParserForElement(element).parse(element, parserContext);
-    }
-
-    /**
-     * Locates the {@link BeanDefinitionParser} from the register implementations using the local name of the supplied
-     * {@link Element}.
-     * 
-     * @param element the element to locate the bean definition parser for
-     * 
-     * @return the parser for the given bean element
-     */
-    protected BeanDefinitionParser findParserForElement(Element element) {
-        QName parserId;
-        BeanDefinitionParser parser = null;
-
-        parserId = XMLHelper.getXSIType(element);
-        if (parserId != null) {
-            log.trace("Attempting to find parser for element of type: {}", parserId);
-            parser = parsers.get(parserId);
-        }
-
-        if (parser == null) {
-            parserId = XMLHelper.getNodeQName(element);
-            log.trace("Attempting to find parser with element name: {}", parserId);
-            parser = parsers.get(parserId);
-        }
-
-        if (parser == null) {
-            log.error("Cannot locate BeanDefinitionParser for element: " + parserId);
-            throw new IllegalArgumentException("Cannot locate BeanDefinitionParser for element: " + parserId);
-        }
-
-        return parser;
-    }
-
-    /**
-     * Locates the {@link BeanDefinitionParser} from the register implementations using the local name of the supplied
-     * {@link Node}. Supports both {@link Element Elements} and {@link Attr Attrs}.
-     * 
-     * @param node the node to locate the decorator for
-     * 
-     * @return the decorator for the given node
-     */
-    protected BeanDefinitionDecorator findDecoratorForNode(Node node) {
-        BeanDefinitionDecorator decorator = null;
-
-        if (node instanceof Element) {
-            decorator = decorators.get(XMLHelper.getXSIType((Element) node));
-            if (decorator == null) {
-                decorator = decorators.get(XMLHelper.getNodeQName(node));
-            }
-        } else if (node instanceof Attr) {
-            decorator = attributeDecorators.get(node.getLocalName());
-        } else {
-            throw new IllegalArgumentException("Cannot decorate based on Nodes of type [" + node.getClass().getName()
-                    + "]");
-        }
-
-        if (decorator == null) {
-            throw new IllegalArgumentException("Cannot locate BeanDefinitionDecorator for " + " ["
-                    + node.getLocalName() + "]");
-        }
-
-        return decorator;
-    }
-
-    /**
-     * Subclasses can call this to register the supplied {@link BeanDefinitionParser} to handle the specified element.
-     * The element name is the local (non-namespace qualified) name.
-     * 
-     * @param elementNameOrType the element name or schema type the parser is for
-     * @param parser the parser to register
-     */
-    protected void registerBeanDefinitionParser(QName elementNameOrType, BeanDefinitionParser parser) {
-        parsers.put(elementNameOrType, parser);
-    }
-
-    /**
-     * Subclasses can call this to register the supplied {@link BeanDefinitionDecorator} to handle the specified
-     * element. The element name is the local (non-namespace qualified) name.
-     * 
-     * @param elementNameOrType the element name or schema type the parser is for
-     * @param decorator the decorator to register
-     */
-    protected void registerBeanDefinitionDecorator(QName elementNameOrType, BeanDefinitionDecorator decorator) {
-        decorators.put(elementNameOrType, decorator);
-    }
-
-    /**
-     * Subclasses can call this to register the supplied {@link BeanDefinitionDecorator} to handle the specified
-     * attribute. The attribute name is the local (non-namespace qualified) name.
-     * 
-     * @param attributeName the name of the attribute to register the decorator for
-     * @param decorator the decorator to register
-     */
-    protected void registerBeanDefinitionDecoratorForAttribute(QName attributeName, BeanDefinitionDecorator decorator) {
-        attributeDecorators.put(attributeName, decorator);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/OpensamlConfigBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/OpensamlConfigBean.java.svn-base
deleted file mode 100644
index 8789215..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/OpensamlConfigBean.java.svn-base
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import java.util.List;
-
-import org.opensaml.Configuration;
-import org.opensaml.DefaultBootstrap;
-import org.opensaml.util.resource.Resource;
-import org.opensaml.xml.XMLConfigurator;
-import org.opensaml.xml.parse.ParserPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * A simple bean that may be used with Spring to initialize the OpenSAML library.
- */
-public class OpensamlConfigBean implements InitializingBean {
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(OpensamlConfigBean.class);
-    
-    /** OpenSAML configuration resources. */
-    private List<Resource> configResources;
-    
-    /** Optional ParserPool to configure. */
-    private ParserPool parserPool;
-    
-    /**
-     * Get the global ParserPool to configure.
-     * 
-     * @return Returns the parserPool.
-     */
-    public ParserPool getParserPool() {
-        return parserPool;
-    }
-
-    /**
-     * Set the global ParserPool to configure.
-     * 
-     * @param newParserPool The parserPool to set.
-     */
-    public void setParserPool(ParserPool newParserPool) {
-        parserPool = newParserPool;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param configs OpenSAML configuration resources
-     */
-    public OpensamlConfigBean(List<Resource> configs){
-        configResources = configs;
-    }
-
-    /** {@inheritDoc} */
-    public void afterPropertiesSet() throws Exception {
-        DefaultBootstrap.bootstrap();
-        
-        if(configResources != null && !configResources.isEmpty()){
-            XMLConfigurator configurator = new XMLConfigurator();
-            for(Resource config : configResources){
-                try{
-                    log.debug("Loading OpenSAML configuration file: {}", config.getLocation());
-                    configurator.load(config.getInputStream());
-                }catch(Exception e){
-                    log.error("Unable to load OpenSAML configuration file: " + config.getLocation());
-                }
-            }
-        }
-        
-        if (getParserPool() != null) {
-            Configuration.setParserPool(getParserPool());
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringConfigurationUtils.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringConfigurationUtils.java.svn-base
deleted file mode 100644
index 233085b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringConfigurationUtils.java.svn-base
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.Duration;
-
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.resource.ResourceException;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
-import org.springframework.beans.factory.xml.NamespaceHandler;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.core.io.InputStreamResource;
-import org.w3c.dom.Element;
-
-/**
- * Utilities to help configure Spring beans.
- */
-public final class SpringConfigurationUtils {
-
-    /** Log4j logger. */
-    private static Logger log = LoggerFactory.getLogger(SpringConfigurationUtils.class);
-
-    /** Baseline for duration calculations (comes from XML Schema standard). */
-    private static Calendar baseline = new GregorianCalendar(1696, 9, 1, 0, 0, 0);
-    
-    /** Private Constructor. */
-    private SpringConfigurationUtils() {
-    }
-
-    /**
-     * Loads a set of spring configuration resources into a given application context.
-     * 
-     * @param beanRegistry registry of spring beans to be populated with information from the given configurations
-     * @param configurationResources list of spring configuration resources
-     * 
-     * @throws ResourceException thrown if there is a problem reading the spring configuration resources into the
-     *             registry
-     */
-    public static void populateRegistry(BeanDefinitionRegistry beanRegistry, List<Resource> configurationResources)
-            throws ResourceException {
-        XmlBeanDefinitionReader configReader = new XmlBeanDefinitionReader(beanRegistry);
-        configReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
-        configReader.setDocumentLoader(new SpringDocumentLoader());
-
-        int numOfResources = configurationResources.size();
-        Resource configurationResource;
-        org.springframework.core.io.Resource[] configSources = new org.springframework.core.io.Resource[numOfResources];
-        for (int i = 0; i < numOfResources; i++) {
-            configurationResource = configurationResources.get(i);
-            if (configurationResource != null && configurationResource.exists()) {
-                configSources[i] = new InputStreamResource(configurationResources.get(i).getInputStream(),
-                        configurationResource.getLocation());
-            } else {
-                log.warn("Configuration resource not loaded because it does not exist: {}", configurationResource
-                        .getLocation());
-            }
-        }
-
-        try {
-            configReader.loadBeanDefinitions(configSources);
-        } catch (BeanDefinitionStoreException e) {
-            throw new ResourceException("Unable to load Spring bean registry with configuration resources", e);
-        }
-    }
-
-    /**
-     * Parses a bean definition using an xsi:type aware version of
-     * {@link BeanDefinitionParserDelegate#parseCustomElement(Element)}.
-     * 
-     * @param element configuration element
-     * @param parserContext current parser context
-     * 
-     * @return bean definition
-     */
-    public static BeanDefinition parseInnerCustomElement(Element element, ParserContext parserContext) {
-        return createBeanDefinition(element, parserContext);
-    }
-
-    /**
-     * Parser a list of bean definitions using an xsi:type aware version of
-     * {@link BeanDefinitionParserDelegate#parseCustomElement(Element)}.
-     * 
-     * @param elements configuration elements
-     * @param parserContext current parser context
-     * 
-     * @return list of bean definition
-     */
-    public static ManagedList parseInnerCustomElements(List<Element> elements, ParserContext parserContext) {
-        ManagedList beans = new ManagedList();
-        if (elements != null) {
-            for (Element element : elements) {
-                beans.add(parseInnerCustomElement(element, parserContext));
-            }
-        }
-
-        return beans;
-    }
-
-    /**
-     * Parses a bean definition using an xsi:type aware version of
-     * BeanDefinitionParserDelegate.parseCustomElement(Element). Assumes the element has an attribute 'id' that provides
-     * a unique identifier for the bean.
-     * 
-     * @param element element to parse
-     * @param parserContext current parser context
-     * 
-     * @return bean definition reference
-     */
-    public static RuntimeBeanReference parseCustomElement(Element element, ParserContext parserContext) {
-        return parseCustomElement(element, "id", parserContext);
-    }
-
-    /**
-     * Parses a bean definition using an xsi:type aware version of
-     * BeanDefinitionParserDelegate.parseCustomElement(Element).
-     * 
-     * @param element element to parse
-     * @param idAttribute attribute that carries the unique ID for the bean
-     * @param parserContext current parser context
-     * 
-     * @return bean definition reference
-     */
-    public static RuntimeBeanReference parseCustomElement(Element element, String idAttribute,
-            ParserContext parserContext) {
-        createBeanDefinition(element, parserContext);
-        RuntimeBeanReference beanRef = new RuntimeBeanReference(element.getAttributeNS(null, idAttribute));
-        beanRef.setSource(element);
-        return beanRef;
-    }
-
-    /**
-     * Creates a {@link BeanDefinition} from a custom element.
-     * 
-     * @param element configuration element
-     * @param parserContext currently parser context
-     * 
-     * @return the bean definition
-     */
-    private static BeanDefinition createBeanDefinition(Element element, ParserContext parserContext) {
-        BeanDefinitionParserDelegate delegate = parserContext.getDelegate();
-        String namespaceUri = element.getNamespaceURI();
-
-        if (XMLHelper.hasXSIType(element)) {
-            namespaceUri = XMLHelper.getXSIType(element).getNamespaceURI();
-        }
-
-        NamespaceHandler handler = delegate.getReaderContext().getNamespaceHandlerResolver().resolve(namespaceUri);
-        if (handler == null) {
-            log.error("Unable to locate NamespaceHandler for namespace [" + namespaceUri + "]");
-            return null;
-        }
-        return handler.parse(element, new ParserContext(delegate.getReaderContext(), delegate));
-    }
-
-    /**
-     * Parses a custom element that is a reference to a bean declared elsewhere.
-     * 
-     * @param element the element that references the bean
-     * @param refAttribute the name of the attribute that contains the referenced bean's name
-     * @param parserContext current parsing context
-     * 
-     * @return reference to the bean or null if the element did not contain the reference attribute
-     */
-    public static RuntimeBeanReference parseCustomElementReference(Element element, String refAttribute,
-            ParserContext parserContext) {
-        String reference = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, refAttribute));
-        if (reference != null) {
-            return new RuntimeBeanReference(reference);
-        }
-
-        return null;
-    }
-
-    /**
-     * Parse list of elements into bean definitions. The list is populated with bean references. Each configuration
-     * element is expected to contain an 'id' attribute that provides a unique ID for each bean.
-     * 
-     * @param elements list of elements to parse
-     * @param parserContext current parsing context
-     * 
-     * @return list of bean references
-     */
-    public static ManagedList parseCustomElements(List<Element> elements, ParserContext parserContext) {
-        return parseCustomElements(elements, "id", parserContext);
-    }
-
-    /**
-     * Parse list of elements into bean definitions.
-     * 
-     * @param elements list of elements to parse
-     * @param idAttribute attribute that carries the unique ID for the bean
-     * @param parserContext current parsing context
-     * 
-     * @return list of bean references
-     */
-    public static ManagedList parseCustomElements(List<Element> elements, String idAttribute,
-            ParserContext parserContext) {
-        if (elements == null) {
-            return null;
-        }
-
-        ManagedList definitions = new ManagedList(elements.size());
-        for (Element e : elements) {
-            definitions.add(parseCustomElement(e, idAttribute, parserContext));
-        }
-
-        return definitions;
-    }
-
-    /**
-     * Converts a duration, either expressed as numerical time or or ISO8601 duration. If a numerical form is used a
-     * warning message indicating that the new IS08601 duration form should be used will be written to the logs.
-     * 
-     * This method will be removed once the deprecated numerical duration form is no longer allowed.
-     * 
-     * @param propertyName Name of the property carrying the duration. This is used in the warning log message if the
-     *            duration is in numerical form.
-     * @param duration the duration to be parsed
-     * @param toMillisFactor used to convert a numerical duration to milliseconds, 0 indicates no conversion
-     * 
-     * @return the duration in milliseconds
-     * 
-     * @throws IllegalArgumentException thrown if the given duration is either an invalid number or ISO8601 duration or
-     *             if the duration is negative
-     */
-    @Deprecated
-    public static long parseDurationToMillis(String propertyName, String duration, int toMillisFactor)
-            throws IllegalArgumentException {
-        if (duration.startsWith("-")) {
-            throw new IllegalArgumentException("Negative durations are not supported");
-        }
-
-        long millis = 0;
-        if (duration.startsWith("P")) {
-            Duration xmlDuration = XMLHelper.getDataTypeFactory().newDuration(duration);
-            millis = xmlDuration.getTimeInMillis(baseline);
-        } else {
-            try {
-                millis = Long.parseLong(duration);
-                if (millis < 0) {
-                    throw new IllegalArgumentException("Negative durations are not supported");
-                }
-                if (toMillisFactor > 0) {
-                    millis *= toMillisFactor;
-                }
-                Duration xmlDuration = XMLHelper.getDataTypeFactory().newDuration(millis);
-                log.warn("Numerical duration form is deprecated. The property {} should use the duration notation: {}",
-                        propertyName, xmlDuration.toString());
-            } catch (NumberFormatException e) {
-
-            }
-        }
-
-        return millis;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringDocumentLoader.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringDocumentLoader.java.svn-base
deleted file mode 100644
index c7b7ffe..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringDocumentLoader.java.svn-base
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.opensaml.xml.parse.ClasspathResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.xml.DocumentLoader;
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * A document loader for Spring that uses a {@link ClasspathResolver} for resolving schema information.
- */
-public class SpringDocumentLoader implements DocumentLoader {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SpringDocumentLoader.class);
-
-    /** {@inheritDoc} */
-    public Document loadDocument(InputSource inputSource, EntityResolver entityResolver, ErrorHandler errorHandler,
-            int validationMode, boolean namespaceAware) throws Exception {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage",
-                "http://www.w3.org/2001/XMLSchema");
-        factory.setCoalescing(true);
-        factory.setIgnoringComments(true);
-        factory.setNamespaceAware(true);
-        factory.setValidating(true);
-
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        builder.setErrorHandler(new LoggingErrorHandler(log));
-        builder.setEntityResolver(new ClasspathResolver());
-        return builder.parse(inputSource);
-    }
-    
-    /**
-     * A SAX error handler that logs errors a {@link Logger} before rethrowing them.
-     */
-    public class LoggingErrorHandler implements ErrorHandler{
-        
-        /** Error logger. */
-        private Logger log;
-        
-        /**
-         * Constructor.
-         *
-         * @param logger logger errors will be written to
-         */
-        public LoggingErrorHandler(Logger logger){
-            log = logger;
-        }
-
-        /** {@inheritDoc} */
-        public void error(SAXParseException exception) throws SAXException {
-            log.trace("Error parsing XML", exception);
-            throw exception;
-        }
-
-        /** {@inheritDoc} */
-        public void fatalError(SAXParseException exception) throws SAXException {
-            log.trace("Fatal XML parsing XML error", exception);
-            throw exception;
-        }
-
-        /** {@inheritDoc} */
-        public void warning(SAXParseException exception) throws SAXException {
-            log.trace("XML parsing warning", exception);
-            throw exception;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops
deleted file mode 100644
index 6ea604f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 120
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries
deleted file mode 100644
index 31d61f8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries
+++ /dev/null
@@ -1,40 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-encoding
-dir
-

-authority
-dir
-

-resolver
-dir
-

-filtering
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/all-wcprops
deleted file mode 100644
index 01c7c5c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 129
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority
-END
-SAML1AttributeAuthorityBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 178
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/SAML1AttributeAuthorityBeanDefinitionParser.java
-END
-AttributeAuthorityNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/AttributeAuthorityNamespaceHandler.java
-END
-SAML2AttributeAuthorityBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 178
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/SAML2AttributeAuthorityBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/entries
deleted file mode 100644
index d79f059..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/entries
+++ /dev/null
@@ -1,130 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAML1AttributeAuthorityBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.042803Z
-6cba5ef3f196c50bfad3a3dfd2d4466f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2247
-

-AttributeAuthorityNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:44.042803Z
-412c6b9b88e3b4f4fdd1440ccfebdcad
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1658
-

-SAML2AttributeAuthorityBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.042803Z
-c6102ff3deb7bf93dc24ea6a9b17bab5
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2247
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/AttributeAuthorityNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/AttributeAuthorityNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/AttributeAuthorityNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/SAML1AttributeAuthorityBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/SAML1AttributeAuthorityBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/SAML1AttributeAuthorityBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/SAML2AttributeAuthorityBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/SAML2AttributeAuthorityBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/prop-base/SAML2AttributeAuthorityBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/AttributeAuthorityNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/AttributeAuthorityNamespaceHandler.java.svn-base
deleted file mode 100644
index 349ad34..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/AttributeAuthorityNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.authority;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/** Namespace handler for attribute authorities. */
-public class AttributeAuthorityNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Handled namespace. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:attribute:authority";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(SAML1AttributeAuthorityBeanDefinitionParser.TYPE_NAME,
-                new SAML1AttributeAuthorityBeanDefinitionParser());
-        
-        registerBeanDefinitionParser(SAML2AttributeAuthorityBeanDefinitionParser.TYPE_NAME,
-                new SAML2AttributeAuthorityBeanDefinitionParser());
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/SAML1AttributeAuthorityBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/SAML1AttributeAuthorityBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a1d5f79..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/SAML1AttributeAuthorityBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.authority;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ShibbolethSAML1AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.config.service.AbstractServiceBeanDefinitionParser;
-
-/** SAML 1 attribute authority bean definition parsers. */
-public class SAML1AttributeAuthorityBeanDefinitionParser extends AbstractServiceBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeAuthorityNamespaceHandler.NAMESPACE,
-            "SAML1AttributeAuthority");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ShibbolethSAML1AttributeAuthority.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        builder.addConstructorArgReference(element.getAttributeNS(null, "resolver"));
-
-        if (element.hasAttributeNS(null, "filter")) {
-            builder.addPropertyReference("filteringEngine", element.getAttributeNS(null, "filter"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/SAML2AttributeAuthorityBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/SAML2AttributeAuthorityBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 7860b76..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/authority/.svn/text-base/SAML2AttributeAuthorityBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.authority;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ShibbolethSAML2AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.config.service.AbstractServiceBeanDefinitionParser;
-
-/** SAML 1 attribute authority bean definition parsers. */
-public class SAML2AttributeAuthorityBeanDefinitionParser extends AbstractServiceBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeAuthorityNamespaceHandler.NAMESPACE,
-            "SAML2AttributeAuthority");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ShibbolethSAML2AttributeAuthority.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        builder.addConstructorArgReference(element.getAttributeNS(null, "resolver"));
-
-        if (element.hasAttributeNS(null, "filter")) {
-            builder.addPropertyReference("filteringEngine", element.getAttributeNS(null, "filter"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/all-wcprops
deleted file mode 100644
index b6213ab..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/all-wcprops
+++ /dev/null
@@ -1,83 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 128
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding
-END
-AttributeEncoderNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/AttributeEncoderNamespaceHandler.java
-END
-SAML2StringNameIDEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 178
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML2StringNameIDEncoderBeanDefinitionParser.java
-END
-SAML1Base64AttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML1Base64AttributeEncoderBeanDefinitionParser.java
-END
-SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 187
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java
-END
-SAML2Base64AttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML2Base64AttributeEncoderBeanDefinitionParser.java
-END
-SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 187
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java
-END
-SAML1StringAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML1StringAttributeEncoderBeanDefinitionParser.java
-END
-SAML1StringNameIdentifierEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML1StringNameIdentifierEncoderBeanDefinitionParser.java
-END
-SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 184
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java
-END
-SAML2StringAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML2StringAttributeEncoderBeanDefinitionParser.java
-END
-SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 184
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java
-END
-BaseScopedAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 180
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/BaseScopedAttributeEncoderBeanDefinitionParser.java
-END
-BaseAttributeEncoderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/BaseAttributeEncoderBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/entries
deleted file mode 100644
index 201ad3d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/entries
+++ /dev/null
@@ -1,470 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAML1Base64AttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.030803Z
-e1cfac04687c27fddfdcf4bc01bc9a5f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2554
-

-SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.030803Z
-c251c243d5c448fb8db40831217ff8f7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2945
-

-SAML2Base64AttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.030803Z
-323b0eec3a01e3fad3616268a041b814
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2929
-

-SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-5560c3374bf127c23efe899a2d07a6f2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3199
-

-SAML1StringAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-b7133c5c63e61fa3de8c1d0abb6933e7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2554
-

-SAML1StringNameIdentifierEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-84f20ea31ca9036c8fd7fb3df99e8dbf
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2396
-

-SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-062441d73dc5c355c10fa608f0ec780e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2817
-

-SAML2StringAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-49308310d6cc494ba86dabcaf456a414
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2921
-

-SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-1718a9b93a4b445110b9fa65daf99029
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2931
-

-BaseScopedAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-758ca93b3434e16f5bc87a2596606e84
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2461
-

-BaseAttributeEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-9ef5c3bee8d5b075a19430d4dc48424a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1785
-

-AttributeEncoderNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:44.034803Z
-cbf6d733c1758b0ded7ce76e9b6199cb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3088
-

-SAML2StringNameIDEncoderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.030803Z
-32f833ea7f199c57ec17c4f56303d23a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2281
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/AttributeEncoderNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/AttributeEncoderNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/AttributeEncoderNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/BaseAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/BaseAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/BaseAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/BaseScopedAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/BaseScopedAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/BaseScopedAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1Base64AttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1Base64AttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1Base64AttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1StringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1StringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1StringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1StringNameIdentifierEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1StringNameIdentifierEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1StringNameIdentifierEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2Base64AttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2Base64AttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2Base64AttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2StringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2StringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2StringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2StringNameIDEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2StringNameIDEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2StringNameIDEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/prop-base/SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/AttributeEncoderNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/AttributeEncoderNamespaceHandler.java.svn-base
deleted file mode 100644
index 7e24468..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/AttributeEncoderNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for the Shibboleth encoder namespace.
- */
-public class AttributeEncoderNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:attribute:encoder";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(SAML1StringAttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML1StringAttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML1Base64AttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML1Base64AttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML1ScopedStringAttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML1ScopedStringAttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML1XMLObjectAttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML1XMLObjectAttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML1StringNameIdentifierEncoderBeanDefinitionParser.SCHEMA_TYPE,
-                new SAML1StringNameIdentifierEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2StringAttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML2StringAttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2ScopedStringAttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML2ScopedStringAttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2Base64AttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML2Base64AttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2XMLObjectAttributeEncoderBeanDefinitionParser.TYPE_NAME,
-                new SAML2XMLObjectAttributeEncoderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2StringNameIDEncoderBeanDefinitionParser.SCHEMA_TYPE,
-                new SAML2StringNameIDEncoderBeanDefinitionParser());
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/BaseAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/BaseAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 070ac01..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/BaseAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base class for Spring bean definition parser for Shibboleth attribute encoders.
- */
-public abstract class BaseAttributeEncoderBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        builder.addPropertyValue("attributeName", DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "name")));
-    }
-
-    /** {@inheritDoc} */
-    public boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/BaseScopedAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/BaseScopedAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 25ee195..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/BaseScopedAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base class for Spring bean definition parser for Shibboleth scoped attribute encoders.
- */
-public abstract class BaseScopedAttributeEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Local name of scope type attribute. */
-    public static final String SCOPE_TYPE_ATTRIBUTE_NAME = "scopeType";
-
-    /** Local name of scope delimiter attribute. */
-    public static final String SCOPE_DELIMITER_ATTRIBUTE_NAME = "scopeDelimiter";
-
-    /** Local name of scope attribute attribute. */
-    public static final String SCOPE_ATTRIBUTE_ATTRIBUTE_NAME = "scopeAttribute";
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        if (element.hasAttributeNS(null, SCOPE_DELIMITER_ATTRIBUTE_NAME)) {
-            builder.addPropertyValue("scopeDelimiter", element.getAttributeNS(null, SCOPE_DELIMITER_ATTRIBUTE_NAME));
-        } else {
-            builder.addPropertyValue("scopeDelimiter", "@");
-        }
-
-        if (element.hasAttributeNS(null, SCOPE_ATTRIBUTE_ATTRIBUTE_NAME)) {
-            builder.addPropertyValue("scopeAttribute", element.getAttributeNS(null, SCOPE_ATTRIBUTE_ATTRIBUTE_NAME));
-        } else {
-            builder.addPropertyValue("scopeAttribute", "Scope");
-        }
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1Base64AttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1Base64AttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 88d91a3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1Base64AttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML1Base64AttributeEncoder;
-
-/**
- * Spring Bean Definition Parser for SAML1 Base64 attribute encoder.
- */
-public class SAML1Base64AttributeEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML1Base64");
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        String namespace = "urn:mace:shibboleth:1.0:attributeNamespace:uri";
-        if (element.hasAttributeNS(null, "namespace")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "namespace"));
-        }
-        builder.addPropertyValue("namespace", namespace);
-
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 1 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML1Base64AttributeEncoder.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index c8d5aeb..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML1ScopedStringAttributeEncoder;
-
-/**
- * Spring Bean Definition Parser for SAML1 string attribute encoder.
- */
-public class SAML1ScopedStringAttributeEncoderBeanDefinitionParser extends
-        BaseScopedAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML1ScopedString");
-
-    /** Local name of namespace attribute. */
-    public static final String NAMESPACE_ATTRIBUTE_NAME = "namespace";
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        if (element.hasAttributeNS(null, "scopeType")) {
-            builder.addPropertyValue("scopeType", element.getAttribute("scopeType"));
-        } else {
-            builder.addPropertyValue("scopeType", "attribute");
-        }
-
-        String namespace = "urn:mace:shibboleth:1.0:attributeNamespace:uri";
-        if (element.hasAttributeNS(null, "namespace")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "namespace"));
-        }
-        builder.addPropertyValue("namespace", namespace);
-
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 1 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML1ScopedStringAttributeEncoder.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1StringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1StringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 3dca98f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1StringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML1StringAttributeEncoder;
-
-/**
- * Spring Bean Definition Parser for SAML1 string attribute encoder.
- */
-public class SAML1StringAttributeEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML1String");
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        String namespace = "urn:mace:shibboleth:1.0:attributeNamespace:uri";
-        if (element.hasAttributeNS(null, "namespace")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "namespace"));
-        }
-        builder.addPropertyValue("namespace", namespace);
-
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 1 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML1StringAttributeEncoder.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1StringNameIdentifierEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1StringNameIdentifierEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 0015fbb..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1StringNameIdentifierEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML1StringNameIdentifierEncoder;
-
-/**
- * Spring bean definition parser for {@link SAML1StringNameIdentifierEncoder}s.
- */
-public class SAML1StringNameIdentifierEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
-            "SAML1StringNameIdentifier");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return SAML1StringNameIdentifierEncoder.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        String namespace = "urn:oasis:names:tc:SAML:1.0:nameid-format:unspecified";
-        if (element.hasAttributeNS(null, "nameFormat")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "nameFormat"));
-        }
-        builder.addPropertyValue("nameFormat", namespace);
-
-        builder.addPropertyValue("nameQualifier", element.getAttributeNS(null, "nameQualifier"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index dbaac03..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML1XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML1XMLObjectAttributeEncoder;
-
-/** Spring Bean Definition Parser for SAML1 XMLObject attribute encoder. */
-public class SAML1XMLObjectAttributeEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML1XMLObject");
-
-    /** Local name of name format attribute. */
-    public static final String NAME_FORMAT_ATTRIBUTE_NAME = "nameFormat";
-
-    /** Local name of friendly name attribute. */
-    public static final String FRIENDLY_NAME_ATTRIBUTE_NAME = "friendlyName";
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        String namespace = "urn:mace:shibboleth:1.0:attributeNamespace:uri";
-        if (element.hasAttributeNS(null, "namespace")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "namespace"));
-        }
-        builder.addPropertyValue("namespace", namespace);
-
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 1 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML1XMLObjectAttributeEncoder.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2Base64AttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2Base64AttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index aaf25aa..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2Base64AttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML2Base64AttributeEncoder;
-
-/**
- * Spring Bean Definition Parser for SAML2 string attribute encoder.
- */
-public class SAML2Base64AttributeEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML2Base64");
-
-    /** Local name of name format attribute. */
-    public static final String NAME_FORMAT_ATTRIBUTE_NAME = "nameFormat";
-
-    /** Local name of friendly name attribute. */
-    public static final String FRIENDLY_NAME_ATTRIBUTE_NAME = "friendlyName";
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        String namespace = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
-        if (element.hasAttributeNS(null, "nameFormat")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "nameFormat"));
-        }
-        builder.addPropertyValue("nameFormat", namespace);
-        
-        builder.addPropertyValue("friendlyName", element.getAttribute(FRIENDLY_NAME_ATTRIBUTE_NAME));
-        
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 2 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2Base64AttributeEncoder.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 38acd3b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2ScopedStringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML2ScopedStringAttributeEncoder;
-
-/**
- * Spring Bean Definition Parser for SAML2 string attribute encoder.
- */
-public class SAML2ScopedStringAttributeEncoderBeanDefinitionParser extends
-        BaseScopedAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML2ScopedString");
-
-    /** Local name of name format attribute. */
-    public static final String NAME_FORMAT_ATTRIBUTE_NAME = "nameFormat";
-
-    /** Local name of friendly name attribute. */
-    public static final String FRIENDLY_NAME_ATTRIBUTE_NAME = "friendlyName";
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-        
-        if (element.hasAttributeNS(null, "scopeType")) {
-            builder.addPropertyValue("scopeType", element.getAttribute("scopeType"));
-        } else {
-            builder.addPropertyValue("scopeType", "inline");
-        }
-
-        String namespace = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
-        if (element.hasAttributeNS(null, "nameFormat")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "nameFormat"));
-        }
-        builder.addPropertyValue("nameFormat", namespace);
-        
-        builder.addPropertyValue("friendlyName", element.getAttribute(FRIENDLY_NAME_ATTRIBUTE_NAME));
-
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 2 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2ScopedStringAttributeEncoder.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2StringAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2StringAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 01eda74..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2StringAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML2StringAttributeEncoder;
-
-/**
- * Spring Bean Definition Parser for SAML2 string attribute encoder.
- */
-public class SAML2StringAttributeEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML2String");
-
-    /** Local name of name format attribute. */
-    public static final String NAME_FORMAT_ATTRIBUTE_NAME = "nameFormat";
-
-    /** Local name of friendly name attribute. */
-    public static final String FRIENDLY_NAME_ATTRIBUTE_NAME = "friendlyName";
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        String namespace = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
-        if (element.hasAttributeNS(null, "nameFormat")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "nameFormat"));
-        }
-        builder.addPropertyValue("nameFormat", namespace);
-        
-        builder.addPropertyValue("friendlyName", element.getAttribute(FRIENDLY_NAME_ATTRIBUTE_NAME));
-
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 2 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2StringAttributeEncoder.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2StringNameIDEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2StringNameIDEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 9a83d07..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2StringNameIDEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML2StringNameIDEncoder;
-
-/**
- * Spring bean definition parser for {@link SAML2StringNameIDEncoder}s.
- */
-public class SAML2StringNameIDEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML2StringNameID");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return SAML2StringNameIDEncoder.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        if(element.hasAttributeNS(null, "nameFormat")){
-            builder.addPropertyValue("nameFormat", element.getAttributeNS(null, "nameFormat"));
-        }else{
-            builder.addPropertyValue("nameFormat", "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
-        }
-        
-        builder.addPropertyValue("nameQualifier", element.getAttributeNS(null, "nameQualifier"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 6a08c37..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/encoding/.svn/text-base/SAML2XMLObjectAttributeEncoderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.encoding;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.provider.SAML2XMLObjectAttributeEncoder;
-
-/** Spring Bean Definition Parser for SAML2 XMLObject attribute encoder. */
-public class SAML2XMLObjectAttributeEncoderBeanDefinitionParser extends BaseAttributeEncoderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML2XMLObject");
-
-    /** Local name of name format attribute. */
-    public static final String NAME_FORMAT_ATTRIBUTE_NAME = "nameFormat";
-
-    /** Local name of friendly name attribute. */
-    public static final String FRIENDLY_NAME_ATTRIBUTE_NAME = "friendlyName";
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        String namespace = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
-        if (element.hasAttributeNS(null, "nameFormat")) {
-            namespace = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "nameFormat"));
-        }
-        builder.addPropertyValue("nameFormat", namespace);
-        
-        builder.addPropertyValue("friendlyName", element.getAttribute(FRIENDLY_NAME_ATTRIBUTE_NAME));
-
-        String attributeName = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "name"));
-        if (attributeName == null) {
-            throw new BeanCreationException("SAML 2 attribute encoders must contain a name");
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2XMLObjectAttributeEncoder.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/all-wcprops
deleted file mode 100644
index 469997a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/all-wcprops
+++ /dev/null
@@ -1,47 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 130
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering
-END
-AttributeFilterPolicyGroupBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/AttributeFilterPolicyGroupBeanDefinitionParser.java
-END
-AttributeFilterNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/AttributeFilterNamespaceHandler.java
-END
-AttributeFilterPolicyBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 176
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/AttributeFilterPolicyBeanDefinitionParser.java
-END
-AttributeFilterPolicyFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/AttributeFilterPolicyFactoryBean.java
-END
-AttributeRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/1027/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/AttributeRuleBeanDefinitionParser.java
-END
-BaseFilterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/BaseFilterBeanDefinitionParser.java
-END
-ShibbolethAttributeFilteringEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 189
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/ShibbolethAttributeFilteringEngineBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/entries
deleted file mode 100644
index 60d7161..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/entries
+++ /dev/null
@@ -1,269 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeFilterPolicyGroupBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.854800Z
-332727b291a7d1e7cdf7c44d0cdc21cd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3709
-

-AttributeFilterNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:43.854800Z
-5143c047b345c395b1a826388a167430
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2430
-

-AttributeFilterPolicyBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.854800Z
-b9420b95141921d5d699b07a21655dcd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4990
-

-AttributeFilterPolicyFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.858800Z
-b7197a978c0ec8dd6007b0744ed6d0ae
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3522
-

-AttributeRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.858800Z
-3aa43ac62b2a2f0ed5a805ab7cc0eefa
-2012-06-21T11:55:01.179203Z
-1027
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4131
-

-match
-dir
-

-BaseFilterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.858800Z
-a1eb728322193507cdc74c54aad074c6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4029
-

-ShibbolethAttributeFilteringEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.858800Z
-ec33b4bbc05e05cc5886b014d7d6bfdf
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2517
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyGroupBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyGroupBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeFilterPolicyGroupBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/AttributeRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/BaseFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/BaseFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/BaseFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/ShibbolethAttributeFilteringEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/ShibbolethAttributeFilteringEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/prop-base/ShibbolethAttributeFilteringEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterNamespaceHandler.java.svn-base
deleted file mode 100644
index b02a615..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering;
-
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for Shibboleth's attribute filtering engine implementation.
- */
-public class AttributeFilterNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:afp";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(ShibbolethAttributeFilteringEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new ShibbolethAttributeFilteringEngineBeanDefinitionParser());
-
-        BeanDefinitionParser parser = new AttributeFilterPolicyGroupBeanDefinitionParser();
-        registerBeanDefinitionParser(AttributeFilterPolicyGroupBeanDefinitionParser.ELEMENT_NAME, parser);
-        registerBeanDefinitionParser(AttributeFilterPolicyGroupBeanDefinitionParser.TYPE_NAME, parser);
-
-        parser = new AttributeFilterPolicyBeanDefinitionParser();
-        registerBeanDefinitionParser(AttributeFilterPolicyBeanDefinitionParser.ELEMENT_NAME, parser);
-        registerBeanDefinitionParser(AttributeFilterPolicyBeanDefinitionParser.TYPE_NAME, parser);
-
-        parser = new AttributeRuleBeanDefinitionParser();
-        registerBeanDefinitionParser(AttributeRuleBeanDefinitionParser.ELEMENT_NAME, parser);
-        registerBeanDefinitionParser(AttributeRuleBeanDefinitionParser.TYPE_NAME, parser);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 1d7002e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser to configure an {@link AttributeFilterPolicyFactoryBean}.
- */
-public class AttributeFilterPolicyBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Element name. */
-    public static final QName ELEMENT_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-            "AttributeFilterPolicy");
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-            "AttributeFilterPolicyType");
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(AttributeFilterPolicyBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeFilterPolicyFactoryBean.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        if(!configElement.hasAttributeNS(null, "id")){
-            log.warn("AttributeFilterPolicy elements should include an 'id' attribute.  This is not currently required but will be in future versions.");
-        }
-        return getQualifiedId(configElement, configElement.getLocalName(), configElement.getAttributeNS(null, "id"));
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-
-        String policyId = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "id"));
-        log.info("Parsing configuration for attribute filter policy {}", policyId);
-        builder.addPropertyValue("policyId", policyId);
-        List<Element> children;
-        Map<QName, List<Element>> childrenMap = XMLHelper.getChildElements(config);
-
-        children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "PolicyRequirementRule"));
-        if (children != null && children.size() > 0) {
-            builder.addPropertyValue("policyRequirement", SpringConfigurationUtils.parseInnerCustomElement(children
-                    .get(0), parserContext));
-        } else {
-            children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-                    "PolicyRequirementRuleReference"));
-            String reference = getAbsoluteReference(config, "PolicyRequirementRule", children.get(0).getTextContent());
-            builder.addPropertyReference("policyRequirement", reference);
-        }
-
-        ManagedList attributeRules = new ManagedList();
-        children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRule"));
-        if (children != null && children.size() > 0) {
-            attributeRules.addAll(SpringConfigurationUtils.parseInnerCustomElements(children, parserContext));
-        }
-
-        children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRuleReference"));
-        if (children != null && children.size() > 0) {
-            String reference;
-            for (Element child : children) {
-                reference = getAbsoluteReference(config, "AttributeRule", child.getTextContent());
-                attributeRules.add(new RuntimeBeanReference(reference));
-            }
-        }
-
-        builder.addPropertyValue("attributeRules", attributeRules);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyFactoryBean.java.svn-base
deleted file mode 100644
index 2290243..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyFactoryBean.java.svn-base
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering;
-
-import java.util.List;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.AttributeFilterPolicy;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.AttributeRule;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-
-/**
- * Spring factory for {@link AttributeFilterPolicy}s.
- */
-public class AttributeFilterPolicyFactoryBean extends AbstractFactoryBean {
-
-    /** Unique identifier for this policy. */
-    private String policyId;
-
-    /** Requirement that must be met for this policy to apply. */
-    private MatchFunctor policyRequirement;
-
-    /** Filters to be used on attribute values. */
-    private List<AttributeRule> attributeRules;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return AttributeFilterPolicy.class;
-    }
-
-    /**
-     * Gets the unique ID for this policy.
-     * 
-     * @return unique ID for this policy
-     */
-    public String getPolicyId() {
-        return policyId;
-    }
-
-    /**
-     * Sets the unique ID for this policy.
-     * 
-     * @param id unique ID for this policy
-     */
-    public void setPolicyId(String id) {
-        policyId = id;
-    }
-
-    /**
-     * Gets the requirement for this policy.
-     * 
-     * @return requirement for this policy
-     */
-    public MatchFunctor getPolicyRequirement() {
-        return policyRequirement;
-    }
-
-    /**
-     * Sets the requirement for this policy.
-     * 
-     * @param requirement requirement for this policy
-     */
-    public void setPolicyRequirement(MatchFunctor requirement) {
-        policyRequirement = requirement;
-    }
-
-    /**
-     * Gets the attribute rules that are in effect if this policy is in effect.
-     * 
-     * @return attribute rules that are in effect if this policy is in effect, never null
-     */
-    public List<AttributeRule> getAttributeRules() {
-        return attributeRules;
-    }
-
-    /**
-     * Sets the attribute rules that are in effect if this policy is in effect.
-     * 
-     * @param rules attribute rules that are in effect if this policy is in effect
-     */
-    public void setAttributeRules(List<AttributeRule> rules) {
-        attributeRules = rules;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        AttributeFilterPolicy policy = new AttributeFilterPolicy(policyId);
-        policy.setPolicyRequirementRule(policyRequirement);
-        policy.getAttributeRules().addAll(attributeRules);
-
-        return policy;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyGroupBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyGroupBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d70856d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeFilterPolicyGroupBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for Shibboleth attribute filtering engine attribute filter policy.
- */
-public class AttributeFilterPolicyGroupBeanDefinitionParser implements BeanDefinitionParser {
-
-    /** Element name. */
-    public static final QName ELEMENT_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-            "AttributeFilterPolicyGroup");
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-            "AttributeFilterPolicyGroupType");
-
-    /** Local name of the policy requirement element. */
-    public static final QName POLICY_REQUIREMENT_ELEMENT_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-            "PolicyRequirement");
-
-    /** Local name of the value filter element. */
-    public static final QName PERMIT_VALUE_ELEMENT_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-            "PermitValue");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AttributeFilterPolicyGroupBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    public BeanDefinition parse(Element config, ParserContext context) {
-        String policyId = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "id"));
-
-        log.debug("Parsing attribute filter policy group {}", policyId);
-
-        List<Element> children;
-        Map<QName, List<Element>> childrenMap = XMLHelper.getChildElements(config);
-
-        children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "PolicyRequirementRule"));
-        SpringConfigurationUtils.parseInnerCustomElements(children, context);
-
-        children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRule"));
-        SpringConfigurationUtils.parseInnerCustomElements(children, context);
-
-        children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "PermitValueRule"));
-        SpringConfigurationUtils.parseInnerCustomElements(children, context);
-
-        children = childrenMap.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeFilterPolicy"));
-        SpringConfigurationUtils.parseInnerCustomElements(children, context);
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 0d81152..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/AttributeRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.AttributeRule;
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser to configure an {@link AttributeRule}.
- */
-public class AttributeRuleBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Element name. */
-    public static final QName ELEMENT_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRule");
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeFilterNamespaceHandler.NAMESPACE, "AttributeRuleType");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, parserContext, builder);
-
-        builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                "attributeID")));
-
-        Map<QName, List<Element>> children = XMLHelper.getChildElements(configElement);
-
-        List<Element> permitValueRule = children.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-                "PermitValueRule"));
-        if (permitValueRule != null && !permitValueRule.isEmpty()) {
-            builder.addPropertyValue("permitValueRule", SpringConfigurationUtils.parseInnerCustomElement(
-                    permitValueRule.get(0), parserContext));
-        }
-
-        List<Element> permitValueRuleRef = children.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-                "PermitValueRuleReference"));
-        if (permitValueRuleRef != null && !permitValueRuleRef.isEmpty()) {
-            String reference = getAbsoluteReference(configElement, "PermitValueRule", permitValueRuleRef.get(0)
-                    .getTextContent());
-            builder.addPropertyReference("permitValueRule", reference);
-        }
-
-        List<Element> denyValueRule = children
-                .get(new QName(AttributeFilterNamespaceHandler.NAMESPACE, "DenyValueRule"));
-        if (denyValueRule != null && !denyValueRule.isEmpty()) {
-            builder.addPropertyValue("denyValueRule", SpringConfigurationUtils.parseInnerCustomElement(denyValueRule
-                    .get(0), parserContext));
-        }
-
-        List<Element> denyValueRuleRef = children.get(new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-                "DenyValueRuleReference"));
-        if (denyValueRuleRef != null && !denyValueRuleRef.isEmpty()) {
-            String reference = getAbsoluteReference(configElement, "DenyValueRule", denyValueRuleRef.get(0)
-                    .getTextContent());
-            builder.addPropertyReference("denyValueRule", reference);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/BaseFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/BaseFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 4793168..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/BaseFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering;
-
-import org.opensaml.common.IdentifierGenerator;
-import org.opensaml.common.impl.RandomIdentifierGenerator;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base class for Spring bean definition parsers within the filter engine configuration. This base class is responsible
- * for generating an ID for the Spring bean that is unique within all the policy components loaded.
- */
-public abstract class BaseFilterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Generator of unique IDs. */
-    private static IdentifierGenerator idGen = new RandomIdentifierGenerator();
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        return getQualifiedId(configElement, configElement.getLocalName(), configElement.getAttributeNS(null, "id"));
-    }
-
-    /**
-     * Generates an ID for a filter engine component. If the given localId is null a random one will be generated.
-     * 
-     * @param configElement component configuration element
-     * @param componentNamespace namespace for the component
-     * @param localId local id or null
-     * 
-     * @return unique ID for the componenent
-     */
-    protected String getQualifiedId(Element configElement, String componentNamespace, String localId) {
-        Element afpgElement = configElement.getOwnerDocument().getDocumentElement();
-        String policyGroupId = DatatypeHelper.safeTrimOrNullString(afpgElement.getAttributeNS(null, "id"));
-
-        StringBuilder qualifiedId = new StringBuilder();
-        qualifiedId.append("/");
-        qualifiedId.append(AttributeFilterPolicyGroupBeanDefinitionParser.ELEMENT_NAME.getLocalPart());
-        qualifiedId.append(":");
-        qualifiedId.append(policyGroupId);
-        if (!DatatypeHelper.isEmpty(componentNamespace)) {
-            qualifiedId.append("/");
-            qualifiedId.append(componentNamespace);
-            qualifiedId.append(":");
-
-            if (DatatypeHelper.isEmpty(localId)) {
-                qualifiedId.append(idGen.generateIdentifier());
-            } else {
-                qualifiedId.append(localId);
-            }
-        }
-
-        return qualifiedId.toString();
-    }
-
-    /**
-     * Gets the absolute refrence given a possibly relative reference.
-     * 
-     * @param configElement component configuration element
-     * @param componentNamespace namespace for the component
-     * @param reference reference to convert into absolute form
-     * 
-     * @return absolute form of the reference
-     */
-    protected String getAbsoluteReference(Element configElement, String componentNamespace, String reference) {
-        if (reference.startsWith("/")) {
-            return reference;
-        } else {
-            return getQualifiedId(configElement, componentNamespace, reference);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/ShibbolethAttributeFilteringEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/ShibbolethAttributeFilteringEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d164996..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/.svn/text-base/ShibbolethAttributeFilteringEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethAttributeFilteringEngine;
-import edu.internet2.middleware.shibboleth.common.config.service.AbstractReloadableServiceBeanDefinitionParser;
-
-/**
- * Spring bean definition parser for {@link ShibbolethAttributeFilteringEngineBeanDefinitionParser} services.
- */
-public class ShibbolethAttributeFilteringEngineBeanDefinitionParser extends
-        AbstractReloadableServiceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(AttributeFilterNamespaceHandler.NAMESPACE,
-            "ShibbolethAttributeFilteringEngine");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethAttributeFilteringEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return ShibbolethAttributeFilteringEngine.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-
-        log.info("Parsing configuration for attribute filtering engine {}", DatatypeHelper.safeTrimOrNullString(config
-                .getAttributeNS(null, "id")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/.svn/all-wcprops
deleted file mode 100644
index da0bff2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 136
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/.svn/entries
deleted file mode 100644
index a74220b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/.svn/entries
+++ /dev/null
@@ -1,34 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-saml
-dir
-

-basic
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/all-wcprops
deleted file mode 100644
index 1a83280..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/all-wcprops
+++ /dev/null
@@ -1,143 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 142
-/java-shib-common/!svn/ver/1031/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic
-END
-AnyMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AnyMatchFunctorBeanDefinitionParser.java
-END
-NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/990/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java
-END
-AttributeScopeStringMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 200
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeScopeStringMatchFunctionBeanDefinitionParser.java
-END
-AttributeIssuerStringMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 201
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeIssuerStringMatchFunctionBeanDefinitionParser.java
-END
-AbstractStringMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 193
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AbstractStringMatchFunctorBeanDefinitionParser.java
-END
-AttributeValueStringMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 200
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeValueStringMatchFunctionBeanDefinitionParser.java
-END
-AttributeScopeRegexMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeScopeRegexMatchFunctionBeanDefinitionParser.java
-END
-AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 200
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java
-END
-AbstractRegexMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AbstractRegexMatchFunctorBeanDefinitionParser.java
-END
-AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 210
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java
-END
-AttributeRequesterStringMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 204
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeRequesterStringMatchFunctionBeanDefinitionParser.java
-END
-AttributeValueRegexMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeValueRegexMatchFunctionBeanDefinitionParser.java
-END
-NotMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 183
-/java-shib-common/!svn/ver/1031/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/NotMatchFunctorBeanDefinitionParser.java
-END
-AndMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 183
-/java-shib-common/!svn/ver/1031/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AndMatchFunctorBeanDefinitionParser.java
-END
-AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 209
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java
-END
-AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 203
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java
-END
-ScriptMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/ScriptMatchFunctorBeanDefinitionParser.java
-END
-AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java
-END
-PrincipalNameStringMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/PrincipalNameStringMatchFunctionBeanDefinitionParser.java
-END
-AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 205
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java
-END
-BasicMatchFunctorNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 180
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/BasicMatchFunctorNamespaceHandler.java
-END
-OrMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/1031/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/OrMatchFunctorBeanDefinitionParser.java
-END
-PrincipalNameRegexMatchFunctionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 198
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/PrincipalNameRegexMatchFunctionBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/entries
deleted file mode 100644
index c7badbc..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/entries
+++ /dev/null
@@ -1,810 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-07-02T12:33:26.613735Z
-1031
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-ad8699e7093a971f3ac6b3b53d67c40f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1669
-

-PrincipalNameStringMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-736249ded4305f69c848c37717ec694b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1622
-

-AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-0b981664a90eafa40ee772b127080e7a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1663
-

-BasicMatchFunctorNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-fd4d250e0f7356eabc78c49de77ba833
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4528
-

-OrMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-df9c2b8933d2503945fc2acc525d08c8
-2012-07-02T12:33:26.613735Z
-1031
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2777
-

-PrincipalNameRegexMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-1beaf9b922d60ae37f68685d376618c4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1616
-

-AnyMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-5809e6cda7889d30c3a7ea248d944be1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1633
-

-NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-925fccf50746f2f57276eb77adb7af46
-2011-07-13T20:25:57.039518Z
-990
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2735
-

-AttributeScopeStringMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-3dfc442ac0fb0799a999176d356b9a3e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1656
-

-AttributeIssuerStringMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-7cdb64382a8a2a80014590721f83aab3
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1644
-

-AbstractStringMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-4c7ae7f8b096d4a45f16369554932dce
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1999
-

-AttributeValueStringMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-8d859a7b5bc0f91029bf9801537b6d9a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1656
-

-AttributeScopeRegexMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-11fa52fd9a49c4666d121d016457513d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1650
-

-AbstractRegexMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-824e92c9fac53f93cb6f75d20aaf811f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1685
-

-AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.734797Z
-5d738718956f3d4634a6829c0f82eb78
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1660
-

-AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-2fdbff8534f215d7e1ed6bc1cf25108f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1638
-

-AttributeRequesterStringMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-857d4e29e7940a359cf77b4ee9753e48
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1659
-

-AttributeValueRegexMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-57a6991792d0f4c9dc9d401e6b4387ac
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1650
-

-NotMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-b882a2ad030b06161838fb63d9a03e64
-2012-07-02T12:33:26.613735Z
-1031
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2804
-

-AndMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-c97626e43b6198e6385fa3c19770831c
-2012-07-02T12:33:26.613735Z
-1031
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2783
-

-AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-165477804ac2c7805129a17886d99097
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1658
-

-AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-1e051be2775f845cf8d078a93ff18bed
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1653
-

-ScriptMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.738797Z
-0191ed99b20d19e5b8ab996726e9963b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2541
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractStringMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractStringMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AbstractStringMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AndMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AndMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AndMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AnyMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AnyMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AnyMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeValueStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeValueStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AttributeValueStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/BasicMatchFunctorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/BasicMatchFunctorNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/BasicMatchFunctorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/NotMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/NotMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/NotMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/OrMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/OrMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/OrMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/PrincipalNameRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/PrincipalNameRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/PrincipalNameRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/PrincipalNameStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/PrincipalNameStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/PrincipalNameStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/ScriptMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/ScriptMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/prop-base/ScriptMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 7eee4b4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-/**
- * Bean definition parser for match functions that match a string value against an attribute value.
- */
-public abstract class AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser extends
-        AbstractRegexMatchFunctorBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        builder.addPropertyValue("attributeId", DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                "attributeID")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 5400e91..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-/**
- * Bean definition parser for match functions that match a string value against an attribute value.
- */
-public abstract class AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser extends
-        AbstractStringMatchFunctorBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        builder.addPropertyValue("attributeId", DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                "attributeID")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index c9b99a0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Base class for regular expression matching functors.
- */
-public abstract class AbstractRegexMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        builder.addPropertyValue("regularExpression", DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(
-                null, "regex")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractStringMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractStringMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 9219bb6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AbstractStringMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Base class for string matching functors.
- */
-public abstract class AbstractStringMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        builder.addPropertyValue("matchString", DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                "value")));
-
-        boolean ignoreCase = false;
-        if (configElement.hasAttributeNS(null, "ignoreCase")) {
-            ignoreCase = XMLHelper.getAttributeValueAsBoolean(configElement.getAttributeNodeNS(null, "ignoreCase"));
-        }
-        builder.addPropertyValue("caseSensitive", !ignoreCase);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AndMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AndMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d46390c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AndMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AndMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Bean definition parser for {@link AndMatchFunctor} objects.
- */
-public class AndMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE, "AND");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AndMatchFunctor.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, parserContext, builder);
-
-        List<Element> ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
-                BasicMatchFunctorNamespaceHandler.NAMESPACE, "Rule");
-
-        builder.addConstructorArgValue(SpringConfigurationUtils.parseInnerCustomElements(ruleElements, parserContext));
-        
-        ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
-                BasicMatchFunctorNamespaceHandler.NAMESPACE, "RuleReference");
-        if(!ruleElements.isEmpty()){
-            throw new BeanCreationException("RuleReference elements within an AND rule are not supported");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AnyMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AnyMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a1e57f9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AnyMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AnyMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Bean definition parser for {@link AnyMatchFunctor} objects.
- */
-public class AnyMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE, "ANY");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AnyMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index de45311..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeIssuerRegexMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeIssuerRegexMatchFunctor}s.
- */
-public class AttributeIssuerRegexMatchFunctionBeanDefinitionParser extends
-        AbstractRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeIssuerRegex");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeIssuerRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 10688d1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeIssuerStringMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeIssuerStringMatchFunctor}s.
- */
-public class AttributeIssuerStringMatchFunctionBeanDefinitionParser extends
-        AbstractStringMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeIssuerString");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeIssuerStringMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 6f9abab..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeRequesterRegexMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeRequesterRegexMatchFunctor}s.
- */
-public class AttributeRequesterRegexMatchFunctionBeanDefinitionParser extends
-        AbstractRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeRequesterRegex");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeRequesterRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 96696fe..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeRequesterStringMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeRequesterStringMatchFunctor}s.
- */
-public class AttributeRequesterStringMatchFunctionBeanDefinitionParser extends
-        AbstractStringMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeRequesterString");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeRequesterStringMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 38b3a7b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeScopeRegexMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeScopeRegexMatchFunctor}s.
- */
-public class AttributeScopeRegexMatchFunctionBeanDefinitionParser extends
-        AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeScopeRegex");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeScopeRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeScopeStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeScopeStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 1106871..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeScopeStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeScopeStringMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeScopeStringMatchFunctor}s.
- */
-public class AttributeScopeStringMatchFunctionBeanDefinitionParser extends
-        AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeScopeString");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeScopeStringMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeValueRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeValueRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 62e3f72..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeValueRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeValueRegexMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeValueRegexMatchFunctor}s.
- */
-public class AttributeValueRegexMatchFunctionBeanDefinitionParser extends
-        AbstractAttributeTargetedRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeValueRegex");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeValueRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeValueStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeValueStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 56a2af8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AttributeValueStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeValueStringMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeValueStringMatchFunctor}s.
- */
-public class AttributeValueStringMatchFunctionBeanDefinitionParser extends
-        AbstractAttributeTargetedStringMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeValueString");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeValueStringMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 20724bf..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AuthenticationMethodRegexMatchFunctor;
-
-/**
- * Bean definition parser for {@link AuthenticationMethodRegexMatchFunctor}s.
- */
-public class AuthenticationMethodRegexMatchFunctionBeanDefinitionParser extends
-        AbstractRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AuthenticationMethodRegex");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AuthenticationMethodRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 3bbbf7b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AuthenticationMethodStringMatchFunctor;
-
-/**
- * Bean definition parser for {@link AuthenticationMethodStringMatchFunctor}s.
- */
-public class AuthenticationMethodStringMatchFunctionBeanDefinitionParser extends
-        AbstractStringMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "AuthenticationMethodString");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AuthenticationMethodStringMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/BasicMatchFunctorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/BasicMatchFunctorNamespaceHandler.java.svn-base
deleted file mode 100644
index cb139e1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/BasicMatchFunctorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Namespace handler for the attribute filter engine basic match functions.
- */
-public class BasicMatchFunctorNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Basic match function namespace. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:afp:mf:basic";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(AndMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AndMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AnyMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AnyMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeIssuerRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeIssuerRegexMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeIssuerStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeIssuerStringMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeRequesterRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeRequesterRegexMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeRequesterStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeRequesterStringMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeScopeRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeScopeRegexMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeScopeStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeScopeStringMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeValueRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeValueRegexMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeValueStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeValueStringMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AuthenticationMethodRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AuthenticationMethodRegexMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AuthenticationMethodStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new AuthenticationMethodStringMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(NotMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new NotMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(NumOfAttributeValuesMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new NumOfAttributeValuesMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(OrMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new OrMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(PrincipalNameRegexMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new PrincipalNameRegexMatchFunctionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(PrincipalNameStringMatchFunctionBeanDefinitionParser.SCHEMA_TYPE,
-                new PrincipalNameStringMatchFunctionBeanDefinitionParser());
-        
-        registerBeanDefinitionParser(ScriptMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new ScriptMatchFunctorBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/NotMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/NotMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a8c4d93..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/NotMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.NotMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Bean definition parser for {@link NotMatchFunctor} objects.
- */
-public class NotMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE, "NOT");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return NotMatchFunctor.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, parserContext, builder);
-
-        List<Element> ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
-                BasicMatchFunctorNamespaceHandler.NAMESPACE, "Rule");
-
-        builder.addConstructorArgValue(SpringConfigurationUtils.parseInnerCustomElement(ruleElements.get(0),
-                parserContext));
-        
-        ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
-                BasicMatchFunctorNamespaceHandler.NAMESPACE, "RuleReference");
-        if(!ruleElements.isEmpty()){
-            throw new BeanCreationException("RuleReference elements within a NOT rule are not supported");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 67c0864..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/NumOfAttributeValuesMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.NumOfAttributeValuesMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Bean definition parser for {@link NumOfAttributeValuesMatchFunctor}s.
- */
-public class NumOfAttributeValuesMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "NumberOfAttributeValues");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return NumOfAttributeValuesMatchFunctor.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                "attributeID")));
-
-        if (configElement.hasAttributeNS(null, "minimum")) {
-            builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                    "minimum")));
-        } else {
-            builder.addConstructorArgValue(0);
-        }
-
-        if (configElement.hasAttributeNS(null, "maximum")) {
-            builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                    "maximum")));
-        } else {
-            builder.addConstructorArgValue(Integer.MAX_VALUE);
-        }
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/OrMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/OrMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 5693306..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/OrMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.OrMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Bean definition parser for {@link OrMatchFunctor} objects.
- */
-public class OrMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE, "OR");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return OrMatchFunctor.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, parserContext, builder);
-
-        List<Element> ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
-                BasicMatchFunctorNamespaceHandler.NAMESPACE, "Rule");
-
-        builder.addConstructorArgValue(SpringConfigurationUtils.parseInnerCustomElements(ruleElements, parserContext));
-        
-        ruleElements = XMLHelper.getChildElementsByTagNameNS(configElement,
-                BasicMatchFunctorNamespaceHandler.NAMESPACE, "RuleReference");
-        if(!ruleElements.isEmpty()){
-            throw new BeanCreationException("RuleReference elements within an OR rule are not supported");
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/PrincipalNameRegexMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/PrincipalNameRegexMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 5409b64..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/PrincipalNameRegexMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.PrincipalRegexMatchFunctor;
-
-/**
- * Bean definition parser for {@link PrincipalRegexMatchFunctor}s.
- */
-public class PrincipalNameRegexMatchFunctionBeanDefinitionParser extends
-        AbstractRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "PrincipalNameRegex");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return PrincipalRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/PrincipalNameStringMatchFunctionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/PrincipalNameStringMatchFunctionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d696c74..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/PrincipalNameStringMatchFunctionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.PrincipalStringMatchFunctor;
-
-/**
- * Bean definition parser for {@link PrincipalStringMatchFunctor}s.
- */
-public class PrincipalNameStringMatchFunctionBeanDefinitionParser extends
-        AbstractStringMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE,
-            "PrincipalNameString");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return PrincipalStringMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/ScriptMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/ScriptMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b58da99..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/basic/.svn/text-base/ScriptMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.ScriptMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Bean definition parser for {@link ScriptMatchFunctor}s.
- */
-public class ScriptMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(BasicMatchFunctorNamespaceHandler.NAMESPACE, "Script");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return ScriptMatchFunctor.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        String scriptLanguage = "javascript";
-        if (configElement.hasAttributeNS(null, "language")) {
-            scriptLanguage = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, "language"));
-        }
-        builder.addConstructorArgValue(scriptLanguage);
-
-        List<Element> scripts = XMLHelper.getChildElementsByTagNameNS(configElement,
-                BasicMatchFunctorNamespaceHandler.NAMESPACE, "Script");
-        builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(scripts.get(0).getTextContent()));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/all-wcprops
deleted file mode 100644
index c22f8b9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/all-wcprops
+++ /dev/null
@@ -1,95 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml
-END
-AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 201
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java
-END
-SAMLMatchFunctorNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 179
-/java-shib-common/!svn/ver/1057/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/SAMLMatchFunctorNamespaceHandler.java
-END
-AttributeInMetadataMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 198
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeInMetadataMatchFunctorBeanDefinitionParser.java
-END
-AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java
-END
-AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 207
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java
-END
-AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 209
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java
-END
-AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 213
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-END
-AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 217
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-END
-AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-END
-AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 210
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java
-END
-AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 213
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-END
-AbstractEntityGroupMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 197
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AbstractEntityGroupMatchFunctorBeanDefinitionParser.java
-END
-AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 213
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java
-END
-AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 217
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-END
-AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/entries
deleted file mode 100644
index 5cf19d0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/entries
+++ /dev/null
@@ -1,538 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.850799Z
-eb0f209ced6724e3775b660e004d44dd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1689
-

-AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.850799Z
-6384d2e12c3b171dcd41585ea0a5c3b9
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1889
-

-AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.850799Z
-1397a467c0a3575c46ac27508f887491
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1704
-

-AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.850799Z
-fec0cdca9735b5dca012530a3431d9cb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1724
-

-AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-73d34db25cad9bdeef4f55343161d5e2
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1739
-

-AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-24afd235b08ffbd72019969749e5a6ef
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1740
-

-AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-4e451a6e3152af11a4e8fa408a5501cd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1710
-

-AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-b826503cb2f9edf957b102d0b1022022
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1724
-

-AbstractEntityGroupMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-3365fb48512710168741d47d04d66cec
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1679
-

-AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.850799Z
-ee6adff5fe58e5d0f7d4158142cf7b99
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1725
-

-AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.850799Z
-a3130ecb611a3631ff306368aa9e8c48
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1739
-

-AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-da210edbe716321104d0bd14c669ad7d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1750
-

-AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.850799Z
-72c15d61ceffd800f1c488f4f52e1f76
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1988
-

-SAMLMatchFunctorNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-108389524eca9bbe1b499a968d5d1c0e
-2013-03-04T16:57:20.140117Z
-1057
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3265
-

-AttributeInMetadataMatchFunctorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.846799Z
-900fb6bc5078a4f7259a25205783025e
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2613
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeInMetadataMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeInMetadataMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeInMetadataMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/SAMLMatchFunctorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/SAMLMatchFunctorNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/prop-base/SAMLMatchFunctorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 259612b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base bean definition parser for
- * {@link edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AbstractEntityAttributeExactMatchFunctor}
- * implementations.
- */
-public abstract class AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser extends
-        AbstractEntityAttributeMatchFunctorBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        builder.addPropertyValue("value", element.getAttributeNS(null, "attributeValue"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index efc5021..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Base bean definition parser for
- * {@link edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AbstractEntityAttributeMatchFunctor}
- * implementations.
- */
-public abstract class AbstractEntityAttributeMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        builder.addPropertyValue("name", element.getAttributeNS(null, "attributeName"));
-
-        if (element.hasAttributeNS(null, "attributeNameFormat")) {
-            builder.addPropertyValue("nameFormat", element.getAttributeNS(null, "attributeNameFormat"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index df8388b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base bean definition parser for
- * {@link edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AbstractEntityAttributeRegexMatchFunctor}
- * implementations.
- */
-public abstract class AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser extends
-        AbstractEntityAttributeMatchFunctorBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        builder.addPropertyValue("valueRegex", element.getAttributeNS(null, "attributeValueRegex"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a0f0831..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Base class for entity group matching functors.
- */
-public abstract class AbstractEntityGroupMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        builder.addPropertyValue("entityGroup", DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                "groupID")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 02cfcb4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AbstractNameIDFormatSupportedMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/** Base class for bean definition parsers that produce {@link AbstractNameIDFormatSupportedMatchFunctor}s. */
-public abstract class AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser extends
-        BaseFilterBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        builder.addPropertyValue("nameIdFormat",
-                DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, "nameIdFormat")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeInMetadataMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeInMetadataMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index c2dd04b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeInMetadataMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeInMetadataMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.config.attribute.filtering.BaseFilterBeanDefinitionParser;
-
-/**
- * Bean definition parser for {@link AttributeInMetadataMatchFunctor}s.
- */
-public class AttributeInMetadataMatchFunctorBeanDefinitionParser extends BaseFilterBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeInMetadata");
-
-    /** {@inheritDoc} */
-    protected void doParse(final Element configElement, final BeanDefinitionBuilder builder) {
-        super.doParse(configElement, builder);
-
-        boolean flag = true;
-        if (configElement.hasAttributeNS(null, "onlyIfRequired")) {
-            flag = XMLHelper.getAttributeValueAsBoolean(configElement.getAttributeNodeNS(null, "onlyIfRequired"));
-        }
-        builder.addPropertyValue("onlyIfRequired", flag);
-        
-        flag = false;
-        if (configElement.hasAttributeNS(null, "matchIfMetadataSilent")) {
-            flag = XMLHelper.getAttributeValueAsBoolean(
-                    configElement.getAttributeNodeNS(null, "matchIfMetadataSilent"));
-        }
-        builder.addPropertyValue("matchIfMetadataSilent", flag);
-    }
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(final Element arg0) {
-        return AttributeInMetadataMatchFunctor.class;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 80e1374..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeIssuerEntityAttributeExactMatchFunctor;
-
-/** Bean definition parser for {@link AttributeIssuerEntityAttributeExactMatchFunctor}. */
-public class AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser extends
-        AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeIssuerEntityAttributeExactMatch");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeIssuerEntityAttributeExactMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 3ba0194..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeIssuerEntityAttributeRegexMatchFunctor;
-
-/** Bean definition parser for {@link AttributeIssuerEntityAttributeRegexMatchFunctor}. */
-public class AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser extends
-        AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeIssuerEntityAttributeRegexMatch");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeIssuerEntityAttributeRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 27da978..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeIssuerInEntityGroupMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeIssuerInEntityGroupMatchFunctor}s.
- */
-public class AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser extends
-        AbstractEntityGroupMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeIssuerInEntityGroup");
-    
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeIssuerInEntityGroupMatchFunctor.class;
-    }
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index dbac4c0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeIssuerNameIDFormatExactMatchFunctor;
-
-/** Bean definition parser for {@link AttributeIssuerNameIDFormatExactMatchFunctor}. */
-public class AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser extends
-        AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeIssuerNameIDFormatExactMatch");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeIssuerNameIDFormatExactMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d15880d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeRequesterEntityAttributeExactMatchFunctor;
-
-/** Bean definition parser for {@link AttributeRequesterEntityAttributeExactMatchFunctor}. */
-public class AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser extends
-        AbstractEntityAttributeExactMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeRequesterEntityAttributeExactMatch");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeRequesterEntityAttributeExactMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index f7a56d3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeRequesterEntityAttributeRegexMatchFunctor;
-
-/** Bean definition parser for {@link AttributeRequesterEntityAttributeRegexMatchFunctor}. */
-public class AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser extends
-        AbstractEntityAttributeRegexMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeRequesterEntityAttributeRegexMatch");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeRequesterEntityAttributeRegexMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 59c8c57..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeRequesterInEntityGroupMatchFunctor;
-
-/**
- * Bean definition parser for {@link AttributeRequesterInEntityGroupMatchFunctor}s.
- */
-public class AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser extends
-        AbstractEntityGroupMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeRequesterInEntityGroup");
-    
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeRequesterInEntityGroupMatchFunctor.class;
-    }
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 3b418ef..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml.AttributeRequesterNameIDFormatExactMatchFunctor;
-
-/** Bean definition parser for {@link AttributeRequesterNameIDFormatExactMatchFunctor}. */
-public class AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser extends
-        AbstractNameIDFormatSupportedMatchFunctorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLMatchFunctorNamespaceHandler.NAMESPACE,
-            "AttributeRequesterNameIDFormatExactMatch");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return AttributeRequesterNameIDFormatExactMatchFunctor.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/SAMLMatchFunctorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/SAMLMatchFunctorNamespaceHandler.java.svn-base
deleted file mode 100644
index 2126f72..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/filtering/match/saml/.svn/text-base/SAMLMatchFunctorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Namespace handler for the attribute filter engine SAML match functions.
- */
-public class SAMLMatchFunctorNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Basic match function namespace. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:afp:mf:saml";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeRequesterInEntityGroupMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeIssuerInEntityGroupMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeIssuerEntityAttributeExactMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(
-                AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeRequesterEntityAttributeExactMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeIssuerEntityAttributeRegexMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(
-                AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeRequesterEntityAttributeRegexMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeIssuerNameIDFormatExactMatchFunctorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeRequesterNameIDFormatExactMatchFunctorBeanDefinitionParser());
-        
-        registerBeanDefinitionParser(AttributeInMetadataMatchFunctorBeanDefinitionParser.SCHEMA_TYPE,
-                new AttributeInMetadataMatchFunctorBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops
deleted file mode 100644
index 33ac122..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops
+++ /dev/null
@@ -1,35 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 129
-/java-shib-common/!svn/ver/1058/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver
-END
-AttributeResolverNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/AttributeResolverNamespaceHandler.java
-END
-AttributeResolverBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 171
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/AttributeResolverBeanDefinitionParser.java
-END
-AbstractResolutionPlugInBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 178
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/AbstractResolutionPlugInBeanDefinitionParser.java
-END
-AbstractResolutionPluginFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/AbstractResolutionPluginFactoryBean.java
-END
-ShibbolethAttributeResolverBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/ShibbolethAttributeResolverBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries
deleted file mode 100644
index 35ee7d1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries
+++ /dev/null
@@ -1,207 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-04T17:24:29.647502Z
-1058
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeResolverNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:43.466792Z
-507f2d4022ce0cac0e46f08b62e14858
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1881
-

-AttributeResolverBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.466792Z
-533db7fe4c8ab46b1f26f09d769248d2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2708
-

-AbstractResolutionPlugInBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.466792Z
-33ada430ba6da12ba37cd2c3b2e4d32d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4550
-

-dataConnector
-dir
-

-AbstractResolutionPluginFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.466792Z
-2ef987b2192fa1f922a646494ab702ea
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2249
-

-ShibbolethAttributeResolverBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.466792Z
-2ab60f10fc1f6b9c2e9a155958035e57
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1717
-

-attributeDefinition
-dir
-

-principalConnector
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AbstractResolutionPlugInBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AbstractResolutionPlugInBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AbstractResolutionPlugInBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AbstractResolutionPluginFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AbstractResolutionPluginFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AbstractResolutionPluginFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AttributeResolverBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AttributeResolverBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AttributeResolverBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AttributeResolverNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AttributeResolverNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/AttributeResolverNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/ShibbolethAttributeResolverBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/ShibbolethAttributeResolverBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/ShibbolethAttributeResolverBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AbstractResolutionPlugInBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AbstractResolutionPlugInBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 8a6015e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AbstractResolutionPlugInBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base class for Spring bean definition parser for Shibboleth resolver plug-ins.
- */
-public abstract class AbstractResolutionPlugInBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Name of resolution plug-in dependency. */
-    public static final QName DEPENDENCY_ELEMENT_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
-            "Dependency");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractResolutionPlugInBeanDefinitionParser.class);
-
-    /**
-     * Parses the plugins ID and attribute definition and data connector dependencies.
-     * 
-     * {@inheritDoc}
-     */
-    protected final void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        String pluginId = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "id"));
-        log.info("Parsing configuration for {} plugin with ID: {}", config.getLocalName(), pluginId);
-        builder.addPropertyValue("pluginId", pluginId);
-
-        Map<QName, List<Element>> children = XMLHelper.getChildElements(config);
-
-        List<String> dependencyIds = parseDependencies(children.get(DEPENDENCY_ELEMENT_NAME));
-        if(dependencyIds != null && !dependencyIds.isEmpty()){
-            log.debug("Dependencies for plugin {}: {}", pluginId, dependencyIds);
-            builder.addPropertyValue("dependencyIds", dependencyIds);
-        }else{
-            log.debug("Dependencies for plugin {}: none", pluginId);
-        }
-
-        doParse(pluginId, config, children, builder, parserContext);
-    }
-
-    /**
-     * Parses the plugin configuration.
-     * 
-     * @param pluginId unique ID of the plugin
-     * @param pluginConfig root plugin configuration element
-     * @param pluginConfigChildren immediate children of the root configuration element (provided to save from having to
-     *            reparse them)
-     * @param pluginBuilder bean definition builder for the plugin
-     * @param parserContext current parsing context
-     */
-    protected abstract void doParse(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext);
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return element.getAttributeNS(null, "id");
-    }
-
-    /**
-     * Parse dependency elements.
-     * 
-     * @param elements DOM elements of type <code>resolver:PluginDependencyType</code>
-     * 
-     * @return the dependency IDs
-     */
-    protected List<String> parseDependencies(List<Element> elements) {
-        if (elements == null || elements.size() == 0) {
-            return null;
-        }
-
-        List<String> dependencyIds = new ArrayList<String>();
-        for (Element dependency : elements) {
-            dependencyIds.add(DatatypeHelper.safeTrimOrNullString(dependency.getAttributeNS(null, "ref")));
-        }
-
-        return dependencyIds;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AbstractResolutionPluginFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AbstractResolutionPluginFactoryBean.java.svn-base
deleted file mode 100644
index 4b5d8b7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AbstractResolutionPluginFactoryBean.java.svn-base
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import java.util.Set;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Base class for resolver resolution plugin factories.
- */
-public abstract class AbstractResolutionPluginFactoryBean extends AbstractFactoryBean {
-
-    /** ID of resolution plug-ins this plugin depends on. */
-    private Set<String> dependencyIds;
-
-    /** Unique ID of the plugin. */
-    private String pluginId;
-
-    /**
-     * Sets the ID of resolution plug-ins this plugin depends on.
-     * 
-     * @param ids ID of attribute definitions this plugin depends on
-     */
-    public void setDependencyIds(Set<String> ids) {
-        dependencyIds = ids;
-    }
-
-    /**
-     * Gets the ID of resolution plug-ins this plugin depends on.
-     * 
-     * @return ID of data connectors this plugin depends on
-     */
-    public Set<String> getDependencyIds() {
-        return dependencyIds;
-    }
-
-    /**
-     * Gets the unique ID of this plugin.
-     * 
-     * @return unique ID of this plugin
-     */
-    public String getPluginId() {
-        return pluginId;
-    }
-
-    /**
-     * Sets the unique ID of this plugin.
-     * 
-     * @param id unique ID of this plugin
-     */
-    public void setPluginId(String id) {
-        pluginId = DatatypeHelper.safeTrimOrNullString(id);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AttributeResolverBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AttributeResolverBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 3906f9e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AttributeResolverBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring configuration parser for {@link edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolver} beans. */
-public class AttributeResolverBeanDefinitionParser implements BeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
-            "AttributeResolverType");
-
-    /** Element name. */
-    public static final QName ELEMENT_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE, 
-            "AttributeResolver");
-
-    /** {@inheritDoc} */
-    public BeanDefinition parse(Element config, ParserContext context) {
-        Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(config);
-        List<Element> children;
-
-        children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalConnector"));
-        SpringConfigurationUtils.parseCustomElements(children, context);
-
-        children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "DataConnector"));
-        SpringConfigurationUtils.parseCustomElements(children, context);
-
-        children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "AttributeDefinition"));
-        SpringConfigurationUtils.parseCustomElements(children, context);
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AttributeResolverNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AttributeResolverNamespaceHandler.java.svn-base
deleted file mode 100644
index 84f1232..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/AttributeResolverNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for the Shibboleth resolver namespace.
- */
-public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:resolver";
-
-    /** {@inheritDoc} */
-    public void init() {
-        BeanDefinitionParser parser = new ShibbolethAttributeResolverBeanDefinitionParser();
-        registerBeanDefinitionParser(ShibbolethAttributeResolverBeanDefinitionParser.SCHEMA_TYPE, parser);
-        
-        parser = new AttributeResolverBeanDefinitionParser();
-        registerBeanDefinitionParser(AttributeResolverBeanDefinitionParser.SCHEMA_TYPE, parser);
-        registerBeanDefinitionParser(AttributeResolverBeanDefinitionParser.ELEMENT_NAME, parser);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/ShibbolethAttributeResolverBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/ShibbolethAttributeResolverBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 9bbeba8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/ShibbolethAttributeResolverBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver;
-import edu.internet2.middleware.shibboleth.common.config.service.AbstractReloadableServiceBeanDefinitionParser;
-
-/**
- * Spring bean definition parser for {@link ShibbolethAttributeResolver} services.
- */
-public class ShibbolethAttributeResolverBeanDefinitionParser extends AbstractReloadableServiceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
-            "ShibbolethAttributeResolver");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return ShibbolethAttributeResolver.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/all-wcprops
deleted file mode 100644
index 43b6511..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/all-wcprops
+++ /dev/null
@@ -1,179 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition
-END
-CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 210
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java
-END
-RegexSplitAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 203
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/RegexSplitAttributeDefinitionBeanDefinitionParser.java
-END
-PrescopedAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 193
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/PrescopedAttributeDefinitionFactoryBean.java
-END
-TransientIdAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 195
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/TransientIdAttributeDefinitionFactoryBean.java
-END
-CryptoTransientIdAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 201
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/CryptoTransientIdAttributeDefinitionFactoryBean.java
-END
-RegexSplitAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 194
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/RegexSplitAttributeDefinitionFactoryBean.java
-END
-SimpleAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/SimpleAttributeDefinitionBeanDefinitionParser.java
-END
-SimpleAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 190
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/SimpleAttributeDefinitionFactoryBean.java
-END
-SAML2NameIDAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 204
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/SAML2NameIDAttributeDefinitionBeanDefinitionParser.java
-END
-SAML2NameIDAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 195
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/SAML2NameIDAttributeDefinitionFactoryBean.java
-END
-MappedAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/MappedAttributeDefinitionBeanDefinitionParser.java
-END
-MappedAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 190
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/MappedAttributeDefinitionFactoryBean.java
-END
-BaseAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 197
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/BaseAttributeDefinitionBeanDefinitionParser.java
-END
-TemplateAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 201
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/TemplateAttributeDefinitionBeanDefinitionParser.java
-END
-BaseAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 188
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/BaseAttributeDefinitionFactoryBean.java
-END
-ScopedAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/ScopedAttributeDefinitionBeanDefinitionParser.java
-END
-ScriptedAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 201
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/ScriptedAttributeDefinitionBeanDefinitionParser.java
-END
-TemplateAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/TemplateAttributeDefinitionFactoryBean.java
-END
-AttributeDefinitionNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 189
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/AttributeDefinitionNamespaceHandler.java
-END
-ScopedAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 190
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/ScopedAttributeDefinitionFactoryBean.java
-END
-ScriptedAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/ScriptedAttributeDefinitionFactoryBean.java
-END
-SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 212
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java
-END
-PrincipalNameAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/PrincipalNameAttributeDefinitionBeanDefinitionParser.java
-END
-PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 222
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java
-END
-SAML1NameIdentifierAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 203
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/SAML1NameIdentifierAttributeDefinitionFactoryBean.java
-END
-PrincipalNameAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 197
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/PrincipalNameAttributeDefinitionFactoryBean.java
-END
-PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 213
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java
-END
-PrescopedAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 202
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/PrescopedAttributeDefinitionBeanDefinitionParser.java
-END
-TransientIdAttributeDefinitionBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 204
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/TransientIdAttributeDefinitionBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/entries
deleted file mode 100644
index 3dad954..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/entries
+++ /dev/null
@@ -1,1014 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-CryptoTransientIdAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.354790Z
-8f50955998efa2a597066a6a3b4e1ecb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2937
-

-RegexSplitAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.354790Z
-c0c90d1b8cabffbfa3702e2843cb83bb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2778
-

-SimpleAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.354790Z
-fff65290418ff48001e7a58e6f945040
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1474
-

-SimpleAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-385bada11b77fd04d4ace79c9a5e12f4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1595
-

-SAML2NameIDAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-644155c3959a133b2a52b56531d72efe
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2735
-

-SAML2NameIDAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-4c6f164628b952ce8f2cdf35e4f6d900
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3589
-

-MappedAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-dab1500a2e98f3409850934ddff22cf3
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6802
-

-MappedAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-0e4fa5408e1bd91f998892feac20a36d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3431
-

-BaseAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-bdd2d4484336e3d664249d02b0eef489
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5265
-

-TemplateAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-11f92db8df8ed2410116e77c7b665d98
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3551
-

-BaseAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-6cce277141fd4f2c082e8e25d5dbcf97
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5806
-

-ScriptedAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.358790Z
-07655de8db251693abbe9db803973387
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3918
-

-ScopedAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-7cd3b9c5026cddc0553875687ac49aca
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2380
-

-TemplateAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-190239d1a68f355b2f04c6ed515f71d1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3385
-

-AttributeDefinitionNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-cf65b34300f4d0b5b146311c092478d7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3693
-

-ScopedAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-7aa1558baeb5d1053983dc69dead4707
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2113
-

-ScriptedAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-4d07434ff1e267d3b3fa73f5338c4350
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3519
-

-SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-1165704a531ec507271fbda2efe54f1b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2615
-

-PrincipalNameAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-de0705707b5d3e196bd251760d3692ed
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1495
-

-PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-df1598c5c53756a91c630b5da4e2d438
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1563
-

-SAML1NameIdentifierAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-328c93eb3f4fa090a385aac49448fa9d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3147
-

-PrincipalNameAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-74fee72e6dfe89a812f15170e13d9a8d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1594
-

-PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-0e3a37b544514f974f63aa06fe4398b7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1674
-

-PrescopedAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-408039ca0f4e6e8d97c5032390af9588
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2553
-

-TransientIdAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-59e7c02b108d6b60c50aa25ca499a4a7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2666
-

-CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.362790Z
-595ca58f30ecd3594666e15b5d0f83f2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2815
-

-RegexSplitAttributeDefinitionBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.354790Z
-3ca480a52e796398a3031c4fc42dadda
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2551
-

-PrescopedAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.354790Z
-a5527a5e8ec6a8f506b8f3cb95d48d26
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2243
-

-TransientIdAttributeDefinitionFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.354790Z
-5f9d32d95167a702c316c01d42f6cf4a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3277
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/AttributeDefinitionNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/AttributeDefinitionNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/AttributeDefinitionNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/BaseAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/BaseAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/BaseAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/BaseAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/BaseAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/BaseAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/CryptoTransientIdAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrescopedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalNameAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalNameAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalNameAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalNameAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalNameAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/PrincipalNameAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/RegexSplitAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML1NameIdentifierAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SAML2NameIDAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScopedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScopedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScopedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScopedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScopedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScopedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/ScriptedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SimpleAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SimpleAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SimpleAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SimpleAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SimpleAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/SimpleAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TemplateAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TemplateAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TemplateAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TemplateAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TemplateAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TemplateAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/prop-base/TransientIdAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/AttributeDefinitionNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/AttributeDefinitionNamespaceHandler.java.svn-base
deleted file mode 100644
index 7ea5689..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/AttributeDefinitionNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for the Shibboleth simple attribute definition namespace.
- */
-public class AttributeDefinitionNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:resolver:ad";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(SimpleAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new SimpleAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(ScopedAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new ScopedAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(PrescopedAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new PrescopedAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(RegexSplitAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new RegexSplitAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2NameIDAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new SAML2NameIDAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(ScriptedAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new ScriptedAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(PrincipalNameAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new PrincipalNameAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MappedAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new MappedAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(TransientIdAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new TransientIdAttributeDefinitionBeanDefinitionParser());
-
-        registerBeanDefinitionParser(CryptoTransientIdAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new CryptoTransientIdAttributeDefinitionBeanDefinitionParser());
-        
-        registerBeanDefinitionParser(TemplateAttributeDefinitionBeanDefinitionParser.TYPE_NAME,
-                new TemplateAttributeDefinitionBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/BaseAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/BaseAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index e644143..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/BaseAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AbstractResolutionPlugInBeanDefinitionParser;
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AttributeResolverNamespaceHandler;
-
-/**
- * Base spring bean definition parser for attribute definitions. AttributeDefinition implementations should provide a
- * custom BeanDefinitionParser by extending this class and overriding the doParse() method to parse any additional
- * attributes or elements it requires. Standard attributes and elements defined by the ResolutionPlugIn and
- * AttributeDefinition schemas will automatically attempt to be parsed.
- */
-public abstract class BaseAttributeDefinitionBeanDefinitionParser extends AbstractResolutionPlugInBeanDefinitionParser {
-
-    /** Local name of attribute encoder. */
-    public static final QName ATTRIBUTE_ENCODER_ELEMENT_NAME = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
-            "AttributeEncoder");
-
-    /** Class logger. */
-    private Logger log = LoggerFactory.getLogger(BaseAttributeDefinitionBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-
-        String sourceAttributeId = pluginConfig.getAttributeNS(null, "sourceAttributeID");
-        log.debug("Setting source attribute ID for attribute definition {} to: {}", pluginId, sourceAttributeId);
-        pluginBuilder.addPropertyValue("sourceAttributeId", sourceAttributeId);
-
-        List<Element> displayNames = pluginConfigChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE,
-                "DisplayName"));
-        if (displayNames != null) {
-            log.debug("Setting {} display names for attribute definition {}", displayNames.size(), pluginId);
-            pluginBuilder.addPropertyValue("displayNames", processLocalizedElement(displayNames));
-        }
-
-        List<Element> displayDescriptions = pluginConfigChildren.get(new QName(
-                AttributeResolverNamespaceHandler.NAMESPACE, "DisplayDescription"));
-        if (displayDescriptions != null) {
-            log.debug("Setting {} display descriptions for attribute definition {}", displayDescriptions.size(),
-                    pluginId);
-            pluginBuilder.addPropertyValue("displayDescriptions", processLocalizedElement(displayDescriptions));
-        }
-
-        boolean dependencyOnly = false;
-        if (pluginConfig.hasAttributeNS(null, "dependencyOnly")) {
-            dependencyOnly = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null,
-                    "dependencyOnly"));
-        }
-        if (log.isDebugEnabled()) {
-            log.debug("Attribute definition {} produces attributes that are only dependencies: {}", pluginId,
-                    dependencyOnly);
-        }
-        pluginBuilder.addPropertyValue("dependencyOnly", dependencyOnly);
-
-        pluginBuilder.addPropertyValue("attributeEncoders", SpringConfigurationUtils.parseInnerCustomElements(
-                pluginConfigChildren.get(ATTRIBUTE_ENCODER_ELEMENT_NAME), parserContext));
-    }
-
-    /**
-     * Used to process string elements that contain an xml:lang attribute expressing localization.
-     * 
-     * @param elements list of elements, must not be null, may be empty
-     * 
-     * @return the localized string indexed by locale
-     */
-    protected Map<Locale, String> processLocalizedElement(List<Element> elements) {
-        HashMap<Locale, String> localizedString = new HashMap<Locale, String>(elements.size());
-        for (Element element : elements) {
-            localizedString.put(XMLHelper.getLanguage(element), element.getTextContent());
-        }
-
-        return localizedString;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/BaseAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/BaseAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index 1304716..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/BaseAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.BaseAttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AbstractResolutionPluginFactoryBean;
-
-/**
- * Base Spring factory bean that produces attribute definitions.
- */
-public abstract class BaseAttributeDefinitionFactoryBean extends AbstractResolutionPluginFactoryBean {
-
-    /** Attribute ID of the source attribute. */
-    private String sourceAttributeId;
-
-    /** Whether attributes produced by the definition should be released outside the resolver. */
-    private boolean dependencyOnly;
-
-    /** Encoders for the attributes. */
-    private List<AttributeEncoder> attributeEncoders;
-
-    /** Localized human intelligible attribute name. */
-    private Map<Locale, String> displayNames;
-
-    /** Localized human readable description of attribute. */
-    private Map<Locale, String> displayDescriptions;
-
-    /**
-     * Gets the encoders for the attributes.
-     * 
-     * @return encoders for the attributes
-     */
-    public List<AttributeEncoder> getAttributeEncoders() {
-        return attributeEncoders;
-    }
-
-    /**
-     * Gets the localized human readable description of attribute.
-     * 
-     * @return human readable description of attribute
-     */
-    public Map<Locale, String> getDisplayDescriptions() {
-        return displayDescriptions;
-    }
-
-    /**
-     * Gets the localized human readable name of the attribute.
-     * 
-     * @return human readable name of the attribute
-     */
-    public Map<Locale, String> getDisplayNames() {
-        return displayNames;
-    }
-
-    /**
-     * Gets the ID of the attribute that serves as the source of information for the attribute definition.
-     * 
-     * @return ID of the attribute that serves as the source of information for the attribute definition
-     */
-    public String getSourceAttributeId() {
-        return sourceAttributeId;
-    }
-
-    /**
-     * Gets whether attributes produced by the definition should be released outside the resolver.
-     * 
-     * @return whether attributes produced by the definition should be released outside the resolver
-     */
-    public boolean isDependencyOnly() {
-        return dependencyOnly;
-    }
-
-    /**
-     * Populates the attribute definition with information from this factory.
-     * 
-     * @param definition attribute definition to populate
-     */
-    protected void populateAttributeDefinition(BaseAttributeDefinition definition) {
-        definition.setDependencyOnly(isDependencyOnly());
-
-        if (getDisplayNames() != null) {
-            definition.getDisplayNames().putAll(getDisplayNames());
-        }
-
-        if (getDisplayDescriptions() != null) {
-            definition.getDisplayDescriptions().putAll(getDisplayDescriptions());
-        }
-
-        if (getDependencyIds() != null) {
-            definition.getDependencyIds().addAll(getDependencyIds());
-        }
-
-        if (getAttributeEncoders() != null) {
-            definition.getAttributeEncoders().addAll(getAttributeEncoders());
-        }
-
-        definition.setId(getPluginId());
-        definition.setSourceAttributeID(getSourceAttributeId());
-    }
-
-    /**
-     * Sets the encoders for the attributes.
-     * 
-     * @param encoders encoders for the attributes
-     */
-    public void setAttributeEncoders(List<AttributeEncoder> encoders) {
-        attributeEncoders = encoders;
-    }
-
-    /**
-     * Sets whether attributes produced by the definition should be released outside the resolver.
-     * 
-     * @param isDependencyOnly whether attributes produced by the definition should be released outside the resolver
-     */
-    public void setDependencyOnly(boolean isDependencyOnly) {
-        dependencyOnly = isDependencyOnly;
-    }
-
-    /**
-     * Sets the human readable description of attribute.
-     * 
-     * @param descriptions human readable descriptions of attribute
-     */
-    public void setDisplayDescriptions(Map<Locale, String> descriptions) {
-        displayDescriptions = descriptions;
-    }
-
-    /**
-     * Sets the human readable name of the attribute.
-     * 
-     * @param names human readable names of the attribute
-     */
-    public void setDisplayNames(Map<Locale, String> names) {
-        displayNames = names;
-    }
-
-    /**
-     * Sets the ID of the attribute that serves as the source of information for the attribute definition.
-     * 
-     * @param id ID of the attribute that serves as the source of information for the attribute definition
-     */
-    public void setSourceAttributeId(String id) {
-        sourceAttributeId = DatatypeHelper.safeTrimOrNullString(id);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 7c9c0f8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for {@link CryptoTransientIdAttributeDefinitionFactoryBean}s.
- */
-public class CryptoTransientIdAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "CryptoTransientId");
-
-    /** {@inheritDoc} */
-    protected Class<CryptoTransientIdAttributeDefinitionFactoryBean> getBeanClass(Element element) {
-        return CryptoTransientIdAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        if (pluginConfig.hasAttributeNS(null, "lifetime")) {
-            long lifetime  = SpringConfigurationUtils.parseDurationToMillis("'lifetime' on AttributeDefinition of type "
-                    + XMLHelper.getXSIType(pluginConfig), pluginConfig.getAttributeNS(null, "lifetime"), 1000 * 60);
-            pluginBuilder.addPropertyValue("idLifetime", lifetime);
-        }
-        
-        pluginBuilder.addPropertyReference("dataSealer", DatatypeHelper.safeTrimOrNullString(pluginConfig
-                .getAttributeNS(null, "dataSealerRef")));
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index b965c08..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/CryptoTransientIdAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.CryptoTransientIdAttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.util.DataSealer;
-
-/**
- * Spring factory bean producing {@link CryptoTransientIdAttributeDefinition}s.
- */
-public class CryptoTransientIdAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** Object used to protect and encrypt identifiers. */
-    private DataSealer dataSealer;
-
-    /** Length, in milliseconds, identifiers are valid. */
-    private long idLifetime = 1000 * 60 * 60 * 4;
-  
-    /** {@inheritDoc} */
-    public Class<CryptoTransientIdAttributeDefinition> getObjectType() {
-        return CryptoTransientIdAttributeDefinition.class;
-    }
-
-    /**
-     * Gets the object used to protect and encrypt identifiers.
-     * 
-     * @return object used to protect and encrypt identifiers
-     */
-    public DataSealer getDataSealer() {
-        return dataSealer;
-    }
-
-    /**
-     * Sets the object used to protect and encrypt identifiers.
-     * 
-     * @param sealer object used to protect and encrypt identifiers
-     */
-    public void setDataSealer(DataSealer sealer) {
-        dataSealer = sealer;
-    }
-
-    /**
-     * Gets the time, in milliseconds, ids are valid.
-     * 
-     * @return time, in milliseconds, ids are valid
-     */
-    public long getIdLifetime() {
-        return idLifetime;
-    }
-
-    /**
-     * Sets the time, in milliseconds, ids are valid.
-     * 
-     * @param lifetime time, in milliseconds, ids are valid
-     */
-    public void setIdLifetime(long lifetime) {
-        idLifetime = lifetime;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        CryptoTransientIdAttributeDefinition definition = new CryptoTransientIdAttributeDefinition(getDataSealer());
-        definition.setIdLifetime(idLifetime);
-        populateAttributeDefinition(definition);
-
-        return definition;
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/MappedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/MappedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ed9a236..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/MappedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.ValueMap;
-
-/**
- * Spring bean definition parser for mapped attribute definition.
- */
-public class MappedAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Mapped");
-
-    /** ValueMap element name. */
-    public static final QName VALUEMAP_ELEMENT_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "ValueMap");
-
-    /** SourceValue element name. */
-    public static final QName SOURCE_VALUE_ELEMENT_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "SourceValue");
-
-    /** ReturnValue element name. */
-    public static final QName RETURN_VALUE_ELEMENT_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "ReturnValue");
-
-    /** DefaultValue element name. */
-    public static final QName DEFAULT_VALUE_ELEMENT_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "DefaultValue");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(MappedAttributeDefinitionBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MappedAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        List<ValueMap> valueMaps = processValueMaps(pluginId, pluginConfigChildren, pluginBuilder);
-        pluginBuilder.addPropertyValue("valueMaps", valueMaps);
-
-        if (pluginConfigChildren.containsKey(DEFAULT_VALUE_ELEMENT_NAME)) {
-            Element defaultValueElem = pluginConfigChildren.get(DEFAULT_VALUE_ELEMENT_NAME).get(0);
-            String defaultValue = DatatypeHelper.safeTrimOrNullString(defaultValueElem.getTextContent());
-            pluginBuilder.addPropertyValue("defaultValue", defaultValue);
-            if (log.isDebugEnabled()) {
-                log.debug("Attribute definition {} default value: {}", pluginId, defaultValue);
-            }
-
-            boolean passThru = false;
-            if (defaultValueElem.hasAttributeNS(null, "passThru")) {
-                passThru = XMLHelper.getAttributeValueAsBoolean(defaultValueElem.getAttributeNodeNS(null, "passThru"));
-            }
-            pluginBuilder.addPropertyValue("passThru", passThru);
-            if (log.isDebugEnabled()) {
-                log.debug("Attribute definition {} uses default value pass thru: {}", pluginId, passThru);
-            }
-        }
-
-    }
-
-    /**
-     * Process the value map elements.
-     * 
-     * @param pluginId ID of this data connector
-     * @param pluginConfigChildren configuration elements
-     * @param pluginBuilder the bean definition parser
-     * 
-     * @return the list of value maps
-     */
-    protected List<ValueMap> processValueMaps(String pluginId, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder) {
-        List<ValueMap> maps = new ArrayList<ValueMap>(5);
-
-        ValueMap valueMap;
-        String returnValue;
-        String sourceValue;
-        boolean ignoreCase;
-        boolean partialMatch;
-        if (pluginConfigChildren.containsKey(VALUEMAP_ELEMENT_NAME)) {
-            for (Element valueMapElem : pluginConfigChildren.get(VALUEMAP_ELEMENT_NAME)) {
-                valueMap = new ValueMap();
-
-                Map<QName, List<Element>> children = XMLHelper.getChildElements(valueMapElem);
-
-                if (children.containsKey(RETURN_VALUE_ELEMENT_NAME)) {
-                    List<Element> returnValueElems = children.get(RETURN_VALUE_ELEMENT_NAME);
-                    returnValue = DatatypeHelper.safeTrimOrNullString(returnValueElems.get(0).getTextContent());
-                    valueMap.setReturnValue(returnValue);
-                }
-
-                if (children.containsKey(SOURCE_VALUE_ELEMENT_NAME)) {
-                    for (Element sourceValueElem : children.get(SOURCE_VALUE_ELEMENT_NAME)) {
-                        sourceValue = DatatypeHelper.safeTrim(sourceValueElem.getTextContent());
-
-                        if (sourceValueElem.hasAttributeNS(null, "ignoreCase")) {
-                            ignoreCase = XMLHelper.getAttributeValueAsBoolean(sourceValueElem.getAttributeNodeNS(null,
-                                    "ignoreCase"));
-                        } else {
-                            ignoreCase = false;
-                        }
-
-                        if (sourceValueElem.hasAttributeNS(null, "partialMatch")) {
-                            partialMatch = XMLHelper.getAttributeValueAsBoolean(sourceValueElem.getAttributeNodeNS(
-                                    null, "partialMatch"));
-                        } else {
-                            partialMatch = false;
-                        }
-
-                        valueMap.getSourceValues().add(valueMap.new SourceValue(sourceValue, ignoreCase, partialMatch));
-                    }
-                }
-
-                maps.add(valueMap);
-            }
-        }
-
-        return maps;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/MappedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/MappedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index b03c63f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/MappedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.MappedAttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.ValueMap;
-
-/**
- * Spring factory bean that produces {@link MappedAttributeDefinition}s.
- */
-public class MappedAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** The default return value. */
-    private String defaultValue;
-
-    /** Whether the definition passes thru unmatched values. */
-    private boolean passThru;
-
-    /** Value maps. */
-    private List<ValueMap> valueMaps;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return MappedAttributeDefinition.class;
-    }
-
-    /**
-     * Gets the default return value.
-     * 
-     * @return the default return value
-     */
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    /**
-     * Get whether the definition passes thru unmatched values.
-     * 
-     * @return whether the definition passes thru unmatched values
-     */
-    public boolean isPassThru() {
-        return passThru;
-    }
-
-    /**
-     * Gets the value maps.
-     * 
-     * @return the value maps.
-     */
-    public List<ValueMap> getValueMaps() {
-        return valueMaps;
-    }
-
-    /**
-     * Sets the default return value.
-     * 
-     * @param newDefaultValue the default return value
-     */
-    public void setDefaultValue(String newDefaultValue) {
-        defaultValue = DatatypeHelper.safeTrimOrNullString(newDefaultValue);
-    }
-
-    /**
-     * Sets whether the definition passes thru unmatched values.
-     * 
-     * @param newPassThru whether the definition passes thru unmatched values
-     */
-    public void setPassThru(boolean newPassThru) {
-        passThru = newPassThru;
-    }
-
-    /**
-     * Sets the value maps.
-     * 
-     * @param newValueMaps the value maps
-     */
-    public void setValueMaps(List<ValueMap> newValueMaps) {
-        valueMaps = newValueMaps;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        MappedAttributeDefinition definition = new MappedAttributeDefinition();
-        populateAttributeDefinition(definition);
-
-        definition.setDefaultValue(defaultValue);
-
-        definition.setPassThru(passThru);
-
-        definition.getValueMaps().addAll(valueMaps);
-
-        return definition;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrescopedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrescopedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ad40598..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrescopedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for prescoped attributes. */
-public class PrescopedAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Prescoped");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(PrescopedAttributeDefinitionBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return PrescopedAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        String scopeDelimiter = "@";
-        if (pluginConfig.hasAttributeNS(null, "scopeDelimiter")) {
-            scopeDelimiter = pluginConfig.getAttributeNS(null, "scopeDelimiter");
-        }
-        log.debug("Setting scope delimiter of attribute definition {} to: {}", pluginId, scopeDelimiter);
-        pluginBuilder.addPropertyValue("scopeDelimiter", scopeDelimiter);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrescopedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrescopedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index 7a7b799..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrescopedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.PrescopedAttributeDefinition;
-
-/**
- * Spring factory bean that produces {@link PrescopedAttributeDefinition}s.
- */
-public class PrescopedAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** Delimiter between value and scope. */
-    private String scopeDelimiter;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PrescopedAttributeDefinition.class;
-    }
-
-    /**
-     * Gets the delimiter between value and scope.
-     * 
-     * @return delimiter between value and scope
-     */
-    public String getScopeDelimiter() {
-        return scopeDelimiter;
-    }
-
-    /**
-     * Sets the delimiter between value and scope.
-     * 
-     * @param delimiter delimiter between value and scope
-     */
-    public void setScopeDelimiter(String delimiter) {
-        scopeDelimiter = DatatypeHelper.safeTrimOrNullString(delimiter);
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        PrescopedAttributeDefinition definition = new PrescopedAttributeDefinition(getScopeDelimiter());
-        populateAttributeDefinition(definition);
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d11e18b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * Spring Bean Definition Parser for static data connector.
- */
-public class PrincipalAuthenticationMethodAttributeDefinitionBeanDefinitionParser extends
-        BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "PrincipalAuthenticationMethod");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index e2e0189..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalAuthenticationMethodAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.PrincipalAuthenticationMethodDefinition;
-
-/**
- * Factory bean for creating simple attribute definitions.
- */
-public class PrincipalAuthenticationMethodAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PrincipalAuthenticationMethodDefinition.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        PrincipalAuthenticationMethodDefinition definition = new PrincipalAuthenticationMethodDefinition();
-        populateAttributeDefinition(definition);
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalNameAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalNameAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 7e6225c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalNameAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * Spring Bean Definition Parser for static data connector.
- */
-public class PrincipalNameAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "PrincipalName");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return PrincipalNameAttributeDefinitionFactoryBean.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalNameAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalNameAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index 440ea5e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/PrincipalNameAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.PrincipalNameDefinition;
-
-/**
- * Factory bean for creating simple attribute definitions.
- */
-public class PrincipalNameAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PrincipalNameDefinition.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        PrincipalNameDefinition definition = new PrincipalNameDefinition();
-        populateAttributeDefinition(definition);
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 2932108..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring Bean Definition Parser for static data connector.
- */
-public class RegexSplitAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "RegexSplit");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return RegexSplitAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        pluginBuilder.addPropertyValue("regex", DatatypeHelper.safeTrimOrNullString(pluginConfig.getAttributeNS(null,
-                "regex")));
-
-        boolean caseSensitive = true;
-        if (pluginConfig.hasAttributeNS(null, "caseSensitive")) {
-            caseSensitive = XMLHelper
-                    .getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null, "caseSensitive"));
-        }
-        pluginBuilder.addPropertyValue("caseSensitive", caseSensitive);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index bceb7b1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/RegexSplitAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.RegexSplitAttributeDefinition;
-
-/** Factory bean for creating regular expression based splitting attribute definitions. */
-public class RegexSplitAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** Regular expression used to split values. */
-    private String regex;
-    
-    /** Whether the regular expression is case sensitive. */
-    private boolean caseSensitive;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return RegexSplitAttributeDefinition.class;
-    }
-
-    /**
-     * Gets the regular expression used to split values.
-     * 
-     * @return regular expression used to split values
-     */
-    public String getRegex() {
-        return regex;
-    }
-
-    /**
-     * Sets the regular expression used to split values.
-     * 
-     * @param regularExpression regular expression used to split values
-     */
-    public void setRegex(String regularExpression) {
-        regex = regularExpression;
-    }
-    
-    /**
-     * Gets whether the regular expression is case sensitive.
-     * 
-     * @return whether the regular expression is case sensitive
-     */
-    public boolean isCaseSensitive() {
-        return caseSensitive;
-    }
-    
-    /**
-     * Sets whether the regular expression is case sensitive.
-     * 
-     * @param isSensitive whether the regular expression is case sensitive
-     */
-    public void setCaseSensitive(boolean isSensitive) {
-        caseSensitive = isSensitive;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        RegexSplitAttributeDefinition definition = new RegexSplitAttributeDefinition(regex, caseSensitive);
-        populateAttributeDefinition(definition);
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index fef13ec..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for SAML 1 NameIdentifier attribute definitions. */
-public class SAML1NameIdentifierAttributeDefinitionBeanDefinitionParser extends
-        BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "SAML1NameIdentifier");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML1NameIdentifierAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        String nameIdFormat = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
-        if (pluginConfig.hasAttributeNS(null, "nameIdFormat")) {
-            nameIdFormat = DatatypeHelper.safeTrimOrNullString(pluginConfig.getAttributeNS(null, "nameIdFormat"));
-        }
-        pluginBuilder.addPropertyValue("nameIdFormat", nameIdFormat);
-
-        pluginBuilder.addPropertyValue("nameIdQualifier", DatatypeHelper.safeTrimOrNullString(pluginConfig
-                .getAttributeNS(null, "nameIdQualifier")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index fa85de7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML1NameIdentifierAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.SAML1NameIdentifierAttributeDefinition;
-
-/** Factory bean for creating {@link SAML1NameIdentifierAttributeDefinition}s. */
-public class SAML1NameIdentifierAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** Format of the NameIdentifier. */
-    private String nameIdentifierFormat;
-
-    /** Name qualifier for the NameIdentifier. */
-    private String nameIdentifierQualifier;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return SAML1NameIdentifierAttributeDefinition.class;
-    }
-
-    /**
-     * Gets the format for the NameIdentifier used as an attribute value.
-     * 
-     * @return format for the NameIdentifier used as an attribute value
-     */
-    public String getNameIdentifierFormat() {
-        return nameIdentifierFormat;
-    }
-
-    /**
-     * Sets the format for the NameIdentifier used as an attribute value.
-     * 
-     * @param format format for the NameIdentifier used as an attribute value
-     */
-    public void setNameIdentifierFormat(String format) {
-        nameIdentifierFormat = format;
-    }
-
-    /**
-     * Gets the NameIdentifier qualifier for the NameIdentifier used as an attribute value.
-     * 
-     * @return NameIdentifier qualifier for the NameIdentifier used as an attribute value
-     */
-    public String getNameIdentifierQualifier() {
-        return nameIdentifierQualifier;
-    }
-
-    /**
-     * Sets the NameIdentifier qualifier for the NameIdentifier used as an attribute value.
-     * 
-     * @param qualifier NameIdentifier qualifier for the NameIdentifier used as an attribute value
-     */
-    public void setNameIdentifierQualifier(String qualifier) {
-        nameIdentifierQualifier = qualifier;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        SAML1NameIdentifierAttributeDefinition definition = new SAML1NameIdentifierAttributeDefinition();
-        populateAttributeDefinition(definition);
-
-        definition.setNameIdQualifier(nameIdentifierQualifier);
-        definition.setNameIdFormat(nameIdentifierFormat);
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b83b198..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for SAML 2 NameID attribute definitions. */
-public class SAML2NameIDAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "SAML2NameID");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2NameIDAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        String nameIdFormat = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
-        if (pluginConfig.hasAttributeNS(null, "nameIdFormat")) {
-            nameIdFormat = DatatypeHelper.safeTrimOrNullString(pluginConfig.getAttributeNS(null, "nameIdFormat"));
-        }
-        pluginBuilder.addPropertyValue("nameIdFormat", nameIdFormat);
-
-        pluginBuilder.addPropertyValue("nameIdQualifier", DatatypeHelper.safeTrimOrNullString(pluginConfig
-                .getAttributeNS(null, "nameIdQualifier")));
-
-        pluginBuilder.addPropertyValue("nameIdSPQualifier", DatatypeHelper.safeTrimOrNullString(pluginConfig
-                .getAttributeNS(null, "nameIdSPQualifier")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index 154c56b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SAML2NameIDAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.SAML2NameIDAttributeDefinition;
-
-/** Factory bean for creating {@link SAML2NameIDAttributeDefinition}s. */
-public class SAML2NameIDAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-    
-    /** Format of the NameID. */
-    private String nameIdFormat;
-
-    /** NameQualifier for the NameID. */
-    private String nameIdQualifier;
-
-    /** SPNameQualifier for the NameID. */
-    private String nameIdSPQualifier;
-    
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return SAML2NameIDAttributeDefinition.class;
-    }
-    
-    /**
-     * Gets the format for the NameID used as an attribute value.
-     * 
-     * @return format for the NameID used as an attribute value
-     */
-    public String getNameIdFormat() {
-        return nameIdFormat;
-    }
-
-    /**
-     * Sets the format for the NameID used as an attribute value.
-     * 
-     * @param format format for the NameID used as an attribute value
-     */
-    public void setNameIdFormat(String format) {
-        nameIdFormat = format;
-    }
-
-    /**
-     * Gets the NameQualifier for the NameID used as an attribute value.
-     * 
-     * @return NameQualifier for the NameID used as an attribute value
-     */
-    public String getNameIdQualifier() {
-        return nameIdQualifier;
-    }
-
-    /**
-     * Sets the NameQualifier for the NameID used as an attribute value.
-     * 
-     * @param qualifier NameQualifier for the NameID used as an attribute value
-     */
-    public void setNameIdQualifier(String qualifier) {
-        nameIdQualifier = qualifier;
-    }
-
-
-    /**
-     * Gets the SPNameQualifier for the NameID used as an attribute value.
-     * 
-     * @return SPNameQualifier for the NameID used as an attribute value
-     */
-    public String getNameIdSPQualifier() {
-        return nameIdSPQualifier;
-    }
-
-    /**
-     * Sets the SPNameQualifier for the NameID used as an attribute value.
-     * 
-     * @param qualifier SPNameQualifier for the NameID used as an attribute value
-     */
-    public void setNameIdSPQualifier(String qualifier) {
-        nameIdSPQualifier = qualifier;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        SAML2NameIDAttributeDefinition definition = new SAML2NameIDAttributeDefinition();
-        populateAttributeDefinition(definition);
-        
-        definition.setNameIdFormat(nameIdFormat);
-        definition.setNameIdQualifier(nameIdQualifier);
-        definition.setNameIdSPQualifier(nameIdSPQualifier);
-        
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScopedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScopedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 58651d7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScopedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring Bean Definition Parser for static data connector.
- */
-public class ScopedAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Scoped");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ScopedAttributeDefinitionBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ScopedAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        String scope = pluginConfig.getAttributeNS(null, "scope");
-        log.debug("Setting scope of attribute definition {} to: {}", pluginId, scope);
-        pluginBuilder.addPropertyValue("scope", scope);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScopedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScopedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index f9d2441..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScopedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.ScopedAttributeDefinition;
-
-/**
- * Spring factory bean that produces {@link ScopedAttributeDefinition}s.
- */
-public class ScopedAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** Scope of the attribute. */
-    private String scope;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ScopedAttributeDefinition.class;
-    }
-
-    /**
-     * Gets the scope of the attribute.
-     * 
-     * @return scope of the attribute
-     */
-    public String getScope() {
-        return scope;
-    }
-
-    /**
-     * Sets the scope of the attribute.
-     * 
-     * @param newScope scope of the attribute
-     */
-    public void setScope(String newScope) {
-        scope = DatatypeHelper.safeTrimOrNullString(newScope);
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        ScopedAttributeDefinition definition = new ScopedAttributeDefinition(getScope());
-        populateAttributeDefinition(definition);
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScriptedAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScriptedAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b50ca55..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScriptedAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for scripted attribute configuration elements.
- */
-public class ScriptedAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Script");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ScriptedAttributeDefinitionBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return ScriptedAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        String scriptLanguage = "javascript";
-        if (pluginConfig.hasAttributeNS(null, "language")) {
-            scriptLanguage = pluginConfig.getAttributeNS(null, "language");
-        }
-        log.debug("Attribute definition {} scripting language: {}", pluginId, scriptLanguage);
-        pluginBuilder.addPropertyValue("language", scriptLanguage);
-
-        String script = null;
-        List<Element> scriptElem = pluginConfigChildren.get(new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-                "Script"));
-        if (scriptElem != null && scriptElem.size() > 0) {
-            script = scriptElem.get(0).getTextContent();
-        } else {
-            List<Element> scriptFileElem = pluginConfigChildren.get(new QName(
-                    AttributeDefinitionNamespaceHandler.NAMESPACE, "ScriptFile"));
-            if (scriptFileElem != null && scriptFileElem.size() > 0) {
-                String scriptFile = scriptFileElem.get(0).getTextContent();
-                try {
-                    script = DatatypeHelper.inputstreamToString(new FileInputStream(scriptFile), null);
-                } catch (IOException e) {
-                    throw new BeanCreationException("Unable to read script file " + scriptFile, e);
-                }
-            }
-        }
-
-        if (script == null) {
-            throw new BeanCreationException("No script specified for this attribute definition");
-        }
-        log.debug("Attribute definition {} script: {}", pluginId, script);
-        pluginBuilder.addPropertyValue("script", script);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScriptedAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScriptedAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index e528f22..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/ScriptedAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.ScriptedAttributeDefinition;
-
-/**
- * Scripted attribute factory.
- */
-public class ScriptedAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** The scripting language used. */
-    private String scriptLanguage;
-
-    /** The file to read the script from. */
-    private String scriptFile;
-
-    /** The script. */
-    private String script;
-
-    /**
-     * Gets the scripting language being used.
-     * 
-     * @return scripting language being used
-     */
-    public String getLanguage() {
-        return scriptLanguage;
-    }
-
-    /**
-     * Sets the scripting language being used.
-     * 
-     * @param language scripting language being used
-     */
-    public void setLanguage(String language) {
-        scriptLanguage = DatatypeHelper.safeTrimOrNullString(language);
-    }
-
-    /**
-     * Gets the script.
-     * 
-     * @return the script
-     */
-    public String getScript() {
-        return script;
-    }
-
-    /**
-     * Sets the script.
-     * 
-     * @param newScript the script
-     */
-    public void setScript(String newScript) {
-        script = DatatypeHelper.safeTrimOrNullString(newScript);
-    }
-
-    /**
-     * Gets the file to read the script from.
-     * 
-     * @return file to read the script from
-     */
-    public String getScriptFile() {
-        return scriptFile;
-    }
-
-    /**
-     * Sets the file to read the script from.
-     * 
-     * @param file file to read the script from
-     */
-    public void setScriptFile(String file) {
-        scriptFile = DatatypeHelper.safeTrimOrNullString(file);
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ScriptedAttributeDefinition.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        ScriptedAttributeDefinition definition = new ScriptedAttributeDefinition(scriptLanguage);
-        populateAttributeDefinition(definition);
-
-        try {
-            if (getScript() == null) {
-                FileInputStream ins = new FileInputStream(scriptFile);
-                byte[] scriptBytes = new byte[ins.available()];
-                ins.read(scriptBytes);
-                script = new String(script);
-            }
-        } catch (IOException e) {
-            throw e;
-        }
-        definition.setScript(script);
-
-        definition.initialize();
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SimpleAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SimpleAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 7f7bdb3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SimpleAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * Spring Bean Definition Parser for static data connector.
- */
-public class SimpleAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Simple");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SimpleAttributeDefinitionFactoryBean.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SimpleAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SimpleAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index 37cc275..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/SimpleAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.SimpleAttributeDefinition;
-
-/**
- * Factory bean for creating simple attribute definitions.
- */
-public class SimpleAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return SimpleAttributeDefinition.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        SimpleAttributeDefinition definition = new SimpleAttributeDefinition();
-        populateAttributeDefinition(definition);
-
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TemplateAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TemplateAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bfab954..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TemplateAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for scripted attribute configuration elements.
- */
-public class TemplateAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Template");
-
-    /** SourceValue element name. */
-    public static final QName TEMPLATE_ELEMENT_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "Template");
-
-    /** SourceValue element name. */
-    public static final QName SOURCE_ATTRIBUTE_ELEMENT_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "SourceAttribute");
-
-    /** Class logger. */
-    @SuppressWarnings("unused")
-    private final Logger log = LoggerFactory.getLogger(TemplateAttributeDefinitionBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return TemplateAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        if (pluginConfigChildren.containsKey(TEMPLATE_ELEMENT_NAME)) {
-            Element templateElement = pluginConfigChildren.get(TEMPLATE_ELEMENT_NAME).get(0);
-            String attributeTemplate = DatatypeHelper.safeTrimOrNullString(templateElement.getTextContent());
-            pluginBuilder.addPropertyValue("attributeTemplate", attributeTemplate);
-        }
-
-        List<String> sourceAttributes = new ArrayList<String>();
-        for (Element element : pluginConfigChildren.get(SOURCE_ATTRIBUTE_ELEMENT_NAME)) {
-            sourceAttributes.add(DatatypeHelper.safeTrimOrNullString(element.getTextContent()));
-        }
-        pluginBuilder.addPropertyValue("sourceAttributes", sourceAttributes);
-        
-        String velocityEngineRef = pluginConfig.getAttributeNS(null, "velocityEngine");
-        pluginBuilder.addPropertyReference("velocityEngine", velocityEngineRef);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TemplateAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TemplateAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index d5cccf7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TemplateAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-
-import org.apache.velocity.app.VelocityEngine;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.TemplateAttributeDefinition;
-
-/**
- * Spring factory bean that produces {@link TemplateAttributeDefinition}s.
- */
-public class TemplateAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** Attribute template string. */
-    private String attributeTemplate;
-
-    /** IDs of source attributes. */
-    private List<String> sourceAttributes;
-
-    /** Velocity engine instance. */
-    private VelocityEngine velocityEngine;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return TemplateAttributeDefinition.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        TemplateAttributeDefinition definition = new TemplateAttributeDefinition(velocityEngine);
-        populateAttributeDefinition(definition);
-
-        definition.setAttributeTemplate(attributeTemplate);
-        definition.setSourceAttributes(sourceAttributes);
-
-        definition.initialize();
-
-        return definition;
-    }
-
-    /**
-     * Get the attribute template.
-     * 
-     * @return the attribute template
-     */
-    public String getAttributeTemplate() {
-        return attributeTemplate;
-    }
-
-    /**
-     * Set the attribute template.
-     * 
-     * @param newAttributeTemplate the attribute template
-     */
-    public void setAttributeTemplate(String newAttributeTemplate) {
-        attributeTemplate = newAttributeTemplate;
-    }
-
-    /**
-     * Get the source attribute IDs.
-     * 
-     * @return the source attribute IDs
-     */
-    public List<String> getSourceAttributes() {
-        return sourceAttributes;
-    }
-
-    /**
-     * Set the source attribute IDs.
-     * 
-     * @param newSourceAttributes the source attribute IDs
-     */
-    public void setSourceAttributes(List<String> newSourceAttributes) {
-        sourceAttributes = newSourceAttributes;
-    }
-
-    /**
-     * Get velocity engine instance.
-     * 
-     * @return velocity engine instance
-     */
-    public VelocityEngine getVelocityEngine() {
-        return velocityEngine;
-    }
-
-    /**
-     * Set velocity engine instance.
-     * 
-     * @param newVelocityEngine velocity engine instance
-     */
-    public void setVelocityEngine(VelocityEngine newVelocityEngine) {
-        velocityEngine = newVelocityEngine;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
deleted file mode 100644
index f1bb2db..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TransientIdAttributeDefinitionBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for {@link TransientIdAttributeDefinitionFactoryBean}s.
- */
-public class TransientIdAttributeDefinitionBeanDefinitionParser extends BaseAttributeDefinitionBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "TransientId");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return TransientIdAttributeDefinitionFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        if (pluginConfig.hasAttributeNS(null, "lifetime")) {
-            long lifetime = SpringConfigurationUtils.parseDurationToMillis("lifetime on attribute definition "
-                    + pluginId, pluginConfig.getAttributeNS(null, "lifetime"), 0);
-            pluginBuilder.addPropertyValue("identifierLifetime", lifetime);
-        }
-
-        pluginBuilder.addPropertyReference("identifierStore",
-                DatatypeHelper.safeTrimOrNullString(pluginConfig.getAttributeNS(null, "storageServiceRef")));
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TransientIdAttributeDefinitionFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TransientIdAttributeDefinitionFactoryBean.java.svn-base
deleted file mode 100644
index 252775e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/attributeDefinition/.svn/text-base/TransientIdAttributeDefinitionFactoryBean.java.svn-base
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition;
-
-import org.opensaml.util.storage.StorageService;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.TransientIdAttributeDefinition;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.TransientIdEntry;
-
-/**
- * Spring factory bean producing {@link TransientIdAttributeDefinition}s.
- */
-public class TransientIdAttributeDefinitionFactoryBean extends BaseAttributeDefinitionFactoryBean {
-
-    /** Store used to map transient identifier tokens to principal names. */
-    private StorageService<String, TransientIdEntry> identifierStore;
-    
-    /** Length, in milliseconds, identifiers are valid. */
-    private long idLifetime = 1000 * 60 * 60 * 4;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return TransientIdAttributeDefinition.class;
-    }
-
-    /**
-     * Gets the store used to map transient identifier tokens to principal names.
-     * 
-     * @return store used to map transient identifier tokens to principal names
-     */
-    public StorageService<String, TransientIdEntry> getIdentifierStore() {
-        return identifierStore;
-    }
-
-    /**
-     * Sets the store used to map transient identifier tokens to principal names.
-     * 
-     * @param store store used to map transient identifier tokens to principal names
-     */
-    public void setIdentifierStore(StorageService<String, TransientIdEntry> store) {
-        identifierStore = store;
-    }
-    
-    /**
-     * Gets the length of time, in milliseconds, the identifier are valid.
-     * 
-     * @return length of time, in milliseconds, the identifier are valid
-     */
-    public long getIdentifierLifetime() {
-        return idLifetime;
-    }
-    
-    /**
-     * Sets the length of time, in milliseconds, the identifier are valid.
-     * 
-     * @param lifetime length of time, in milliseconds, the identifier are valid
-     */
-    public void setIdentifierLifetime(long lifetime) {
-        idLifetime = lifetime;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        TransientIdAttributeDefinition definition = new TransientIdAttributeDefinition(getIdentifierStore());
-        populateAttributeDefinition(definition);
-        definition.setTokenLiftetime(idLifetime);
-        return definition;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/all-wcprops
deleted file mode 100644
index cec9f1b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/all-wcprops
+++ /dev/null
@@ -1,83 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 143
-/java-shib-common/!svn/ver/1058/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector
-END
-ComputedIDDataConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/ComputedIDDataConnectorFactoryBean.java
-END
-StoredIDDataConnectorBeanFactory.java
-K 25
-svn:wc:ra_dav:version-url
-V 180
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StoredIDDataConnectorBeanFactory.java
-END
-LdapDataConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/1015/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorBeanDefinitionParser.java
-END
-LdapDataConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/1058/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorFactoryBean.java
-END
-RDBMSDataConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/RDBMSDataConnectorBeanDefinitionParser.java
-END
-StaticDataConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 187
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StaticDataConnectorBeanDefinitionParser.java
-END
-RDBMSDataConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/RDBMSDataConnectorFactoryBean.java
-END
-StaticDataConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 178
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StaticDataConnectorFactoryBean.java
-END
-BaseDataConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/BaseDataConnectorBeanDefinitionParser.java
-END
-BaseDataConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 176
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/BaseDataConnectorFactoryBean.java
-END
-ComputedIDDataConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 191
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/ComputedIDDataConnectorBeanDefinitionParser.java
-END
-StoredIDDataConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 189
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/StoredIDDataConnectorBeanDefinitionParser.java
-END
-DataConnectorNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/DataConnectorNamespaceHandler.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/entries
deleted file mode 100644
index d1996ca..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/entries
+++ /dev/null
@@ -1,470 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-04T17:24:29.647502Z
-1058
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-BaseDataConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.086784Z
-989b1a1f56b34dc7d7a40eb9a4a84f6b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2466
-

-ComputedIDDataConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.086784Z
-66e3c8f2ee30c96d06bd5239e7e745c0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2518
-

-StoredIDDataConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.086784Z
-ad6423ffb05fd964dd03e2f93766f5f4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12345
-

-DataConnectorNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:43.082784Z
-f9b2f817923369b8960e04ddec949ea0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2139
-

-ComputedIDDataConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.082784Z
-bc05b565cc0f49b12590b13345da1f47
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3376
-

-StoredIDDataConnectorBeanFactory.java
-file
-
-
-
-
-2014-02-19T17:27:43.082784Z
-1f232e31210e048a390ac2b34fc6f8b0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4518
-

-LdapDataConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.082784Z
-a8e7332d420e115454303060446ef71f
-2012-02-23T15:10:40.444004Z
-1015
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-23050
-

-LdapDataConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.082784Z
-247bc76d4c3dbeca513282259a90056e
-2013-03-04T17:24:29.647502Z
-1058
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-22214
-

-RDBMSDataConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.082784Z
-3113734557ce60ee5f105601f727e219
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-19801
-

-StaticDataConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.086784Z
-24df9464807f208203fadc3734817772
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3710
-

-RDBMSDataConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.086784Z
-7dd702169c84cb8ff41d9ba7d5056945
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9435
-

-StaticDataConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.086784Z
-07d7f6360c24de09761fa1a617f7673a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2366
-

-BaseDataConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.086784Z
-85d2de5adb0d45f7311ed31d1598520a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3239
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/BaseDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/BaseDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/BaseDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/BaseDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/BaseDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/BaseDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/ComputedIDDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/ComputedIDDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/ComputedIDDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/ComputedIDDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/ComputedIDDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/ComputedIDDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/DataConnectorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/DataConnectorNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/DataConnectorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/LdapDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/LdapDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/LdapDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/LdapDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/LdapDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/LdapDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/RDBMSDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/RDBMSDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/RDBMSDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/RDBMSDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/RDBMSDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/RDBMSDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StaticDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StaticDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StaticDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StaticDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StaticDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StaticDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StoredIDDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StoredIDDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StoredIDDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StoredIDDataConnectorBeanFactory.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StoredIDDataConnectorBeanFactory.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/prop-base/StoredIDDataConnectorBeanFactory.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/BaseDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/BaseDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 0641837..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/BaseDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AbstractResolutionPlugInBeanDefinitionParser;
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AttributeResolverNamespaceHandler;
-
-/**
- * Base spring bean definition parser for data connectors. DataConnector implementations should provide a custom
- * BeanDefinitionParser by extending this class and overriding the
- * {@link #doParse(String, Element, Map, BeanDefinitionBuilder, ParserContext)} method to parse any additional
- * attributes or elements it requires. Standard attributes and elements defined by the ResolutionPlugIn and
- * DataConnector schemas will automatically attempt to be parsed.
- */
-public abstract class BaseDataConnectorBeanDefinitionParser extends AbstractResolutionPlugInBeanDefinitionParser {
-
-    /** Failover data connector attribute name. */
-    public static final QName FAILOVER_DATA_CONNECTOR_ELEMENT_NAME = new QName(
-            AttributeResolverNamespaceHandler.NAMESPACE, "FailoverDataConnector");
-
-    /** Log4j logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseDataConnectorBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-
-        List<Element> failoverConnector = pluginConfigChildren.get(FAILOVER_DATA_CONNECTOR_ELEMENT_NAME);
-        if (failoverConnector != null && !failoverConnector.isEmpty()) {
-            String connectorId = DatatypeHelper.safeTrimOrNullString(failoverConnector.get(0).getAttributeNS(null,
-                    "ref"));
-            log.debug("Setting the following failover data connector dependencies for plugin {}: {}", pluginId,
-                    connectorId);
-            pluginBuilder.addPropertyValue("failoverDataConnectorIds", connectorId);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/BaseDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/BaseDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index f0775c9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/BaseDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.BaseDataConnector;
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AbstractResolutionPluginFactoryBean;
-
-/**
- * Base class for data connector factories.
- */
-public abstract class BaseDataConnectorFactoryBean extends AbstractResolutionPluginFactoryBean {
-
-    /** ID of failover data connectors for this plugin. */
-    private String failoverDataConnectorId;
-
-    /**
-     * Gets the ID of failover data connectors for this plugin.
-     * 
-     * @return ID of failover data connectors for this plugin
-     */
-    public String getFailoverDataConnectorId() {
-        return failoverDataConnectorId;
-    }
-
-    /**
-     * Sets the ID of failover data connectors for this plugin.
-     * 
-     * @param id ID of failover data connectors for this plugin
-     */
-    public void setFailoverDataConnectorIds(String id) {
-        failoverDataConnectorId = id;
-    }
-
-    /**
-     * Populates data connector with information from this factory.
-     * 
-     * @param connector data connector with information from this factory
-     */
-    protected void populateDataConnector(BaseDataConnector connector) {
-        connector.setId(getPluginId());
-
-        if (getDependencyIds() != null) {
-            connector.getDependencyIds().addAll(getDependencyIds());
-        }
-
-        if (getFailoverDataConnectorId() != null) {
-            connector.setFailoverDependencyIds(getFailoverDataConnectorId());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/ComputedIDDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/ComputedIDDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 1b45927..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/ComputedIDDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for configuring an computed ID data connector.
- */
-public class ComputedIDDataConnectorBeanDefinitionParser extends BaseDataConnectorBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName TYPE_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "ComputedId");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ComputedIDDataConnectorFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        if (pluginConfig.hasAttributeNS(null, "generatedAttributeID")) {
-            pluginBuilder.addPropertyValue("generatedAttribute", pluginConfig.getAttributeNS(null,
-                    "generatedAttributeID"));
-        } else {
-            pluginBuilder.addPropertyValue("generatedAttribute", "computedId");
-        }
-
-        pluginBuilder.addPropertyValue("sourceAttribute", pluginConfig.getAttributeNS(null, "sourceAttributeID"));
-        pluginBuilder.addPropertyValue("salt", pluginConfig.getAttributeNS(null, "salt").getBytes());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/ComputedIDDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/ComputedIDDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index 363d9b7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/ComputedIDDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.ComputedIDDataConnector;
-
-/**
- * Spring factory bean for {@link ComputedIDDataConnector}s.
- */
-public class ComputedIDDataConnectorFactoryBean extends BaseDataConnectorFactoryBean {
-
-    /** ID of the attribute generated by the connector. */
-    private String generatedAttribute;
-
-    /** ID of the attribute whose first value is used when generating the computed ID. */
-    private String sourceAttribute;
-
-    /** Salt used when computing the ID. */
-    private byte[] salt;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ComputedIDDataConnector.class;
-    }
-
-    /**
-     * Gets the ID of the attribute generated by the connector.
-     * 
-     * @return ID of the attribute generated by the connector
-     */
-    public String getGeneratedAttribute() {
-        return generatedAttribute;
-    }
-
-    /**
-     * Sets the ID of the attribute generated by the connector.
-     * 
-     * @param id ID of the attribute generated by the connector
-     */
-    public void setGeneratedAttribute(String id) {
-        generatedAttribute = id;
-    }
-
-    /**
-     * Gets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @return ID of the attribute whose first value is used when generating the computed ID
-     */
-    public String getSourceAttribute() {
-        return sourceAttribute;
-    }
-
-    /**
-     * Sets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @param id ID of the attribute whose first value is used when generating the computed ID
-     */
-    public void setSourceAttribute(String id) {
-        this.sourceAttribute = id;
-    }
-
-    /**
-     * Gets the salt used when computing the ID.
-     * 
-     * @return salt used when computing the ID
-     */
-    public byte[] getSalt() {
-        return salt;
-    }
-
-    /**
-     * Sets the salt used when computing the ID.
-     * 
-     * @param salt salt used when computing the ID
-     */
-    public void setSalt(byte[] salt) {
-        this.salt = salt;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        ComputedIDDataConnector connector = new ComputedIDDataConnector(getGeneratedAttribute(), getSourceAttribute(),
-                getSalt());
-        populateDataConnector(connector);
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/DataConnectorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/DataConnectorNamespaceHandler.java.svn-base
deleted file mode 100644
index a423753..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/DataConnectorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for the Shibboleth static data connector namespace.
- */
-public class DataConnectorNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:resolver:dc";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(StaticDataConnectorBeanDefinitionParser.TYPE_NAME,
-                new StaticDataConnectorBeanDefinitionParser());
-        registerBeanDefinitionParser(ComputedIDDataConnectorBeanDefinitionParser.TYPE_NAME,
-                new ComputedIDDataConnectorBeanDefinitionParser());
-        registerBeanDefinitionParser(StoredIDDataConnectorBeanDefinitionParser.TYPE_NAME,
-                new StoredIDDataConnectorBeanDefinitionParser());
-        registerBeanDefinitionParser(RDBMSDataConnectorBeanDefinitionParser.TYPE_NAME,
-                new RDBMSDataConnectorBeanDefinitionParser());
-        registerBeanDefinitionParser(LdapDataConnectorBeanDefinitionParser.TYPE_NAME,
-                new LdapDataConnectorBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/LdapDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/LdapDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d927c4f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/LdapDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.LdapPoolEmptyStrategy;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.LdapPoolVTStrategy;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.LdapDataConnector.AUTHENTICATION_TYPE;
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.vt.middleware.ldap.SearchFilter;
-import edu.vt.middleware.ldap.LdapConfig.SearchScope;
-import edu.vt.middleware.ldap.handler.ConnectionHandler.ConnectionStrategy;
-import edu.vt.middleware.ldap.pool.CompareLdapValidator;
-import edu.vt.middleware.ldap.pool.LdapPoolConfig;
-import edu.vt.middleware.ldap.pool.LdapValidator;
-
-/** Spring bean definition parser for configuring an LDAP data connector. */
-public class LdapDataConnectorBeanDefinitionParser extends BaseDataConnectorBeanDefinitionParser {
-
-    /** LDAP data connector type name. */
-    public static final QName TYPE_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "LDAPDirectory");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(LdapDataConnectorBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class<?> getBeanClass(Element element) {
-        return LdapDataConnectorFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        processBasicConnectionConfig(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-        processSecurityConfig(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-        processResultHandlingConfig(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        Map<String, String> ldapProperties =
-                processLDAPProperties(pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE,
-                        "LDAPProperty")));
-        if (ldapProperties != null) {
-            log.debug("Data connector {} LDAP properties: {}", pluginId, ldapProperties);
-            pluginBuilder.addPropertyValue("ldapProperties", ldapProperties);
-        }
-
-        processPoolingConfig(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        processCacheConfig(pluginId, pluginConfig, pluginBuilder);
-    }
-
-    /**
-     * Process the basic LDAP connection configuration for the LDAP data connector.
-     * 
-     * @param pluginId ID of the LDAP plugin
-     * @param pluginConfig LDAP plugin configuration element
-     * @param pluginConfigChildren child elements of the plugin
-     * @param pluginBuilder plugin builder
-     * @param parserContext current parsing context
-     */
-    protected void processBasicConnectionConfig(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-
-        String ldapURL = pluginConfig.getAttributeNS(null, "ldapURL");
-        log.debug("Data connector {} LDAP URL: {}", pluginId, ldapURL);
-        pluginBuilder.addPropertyValue("ldapUrl", ldapURL);
-
-        ConnectionStrategy connStrategy = ConnectionStrategy.ACTIVE_PASSIVE;
-        if (pluginConfig.hasAttributeNS(null, "connectionStrategy")) {
-            connStrategy = ConnectionStrategy.valueOf(pluginConfig.getAttributeNS(null, "connectionStrategy"));
-        }
-        log.debug("Data connector {} connection strategy: {}", pluginId, connStrategy);
-        pluginBuilder.addPropertyValue("connectionStrategy", connStrategy);
-
-        if (pluginConfig.hasAttributeNS(null, "baseDN")) {
-            String baseDN = pluginConfig.getAttributeNS(null, "baseDN");
-            log.debug("Data connector {} base DN: {}", pluginId, baseDN);
-            pluginBuilder.addPropertyValue("baseDN", baseDN);
-        }
-
-        AUTHENTICATION_TYPE authnType = AUTHENTICATION_TYPE.SIMPLE;
-        if (pluginConfig.hasAttributeNS(null, "authenticationType")) {
-            authnType = AUTHENTICATION_TYPE.valueOf(pluginConfig.getAttributeNS(null, "authenticationType"));
-        }
-        log.debug("Data connector {} authentication type: {}", pluginId, authnType);
-        pluginBuilder.addPropertyValue("authenticationType", authnType);
-
-        String principal = pluginConfig.getAttributeNS(null, "principal");
-        log.debug("Data connector {} principal: {}", pluginId, principal);
-        pluginBuilder.addPropertyValue("principal", principal);
-
-        String credential = pluginConfig.getAttributeNS(null, "principalCredential");
-        pluginBuilder.addPropertyValue("principalCredential", credential);
-
-        String templateEngineRef = pluginConfig.getAttributeNS(null, "templateEngine");
-        pluginBuilder.addPropertyReference("templateEngine", templateEngineRef);
-
-        String filterTemplate =
-                pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE, "FilterTemplate")).get(0)
-                        .getTextContent();
-        filterTemplate = DatatypeHelper.safeTrimOrNullString(filterTemplate);
-        log.debug("Data connector {} LDAP filter template: {}", pluginId, filterTemplate);
-        pluginBuilder.addPropertyValue("filterTemplate", filterTemplate);
-
-        SearchScope searchScope = SearchScope.SUBTREE;
-        if (pluginConfig.hasAttributeNS(null, "searchScope")) {
-            searchScope = SearchScope.valueOf(pluginConfig.getAttributeNS(null, "searchScope"));
-        }
-        log.debug("Data connector {} search scope: {}", pluginId, searchScope);
-        pluginBuilder.addPropertyValue("searchScope", searchScope);
-
-        QName returnAttributesName = new QName(DataConnectorNamespaceHandler.NAMESPACE, "ReturnAttributes");
-        if (pluginConfigChildren.containsKey(returnAttributesName)) {
-            List<String> returnAttributes =
-                    XMLHelper.getElementContentAsList(pluginConfigChildren.get(returnAttributesName).get(0));
-            log.debug("Data connector {} return attributes: {}", pluginId, returnAttributes);
-            pluginBuilder.addPropertyValue("returnAttributes", returnAttributes);
-        }
-    }
-
-    /**
-     * Process the LDAP connection security configuration for the LDAP data connector.
-     * 
-     * @param pluginId ID of the LDAP plugin
-     * @param pluginConfig LDAP plugin configuration element
-     * @param pluginConfigChildren child elements of the plugin
-     * @param pluginBuilder plugin builder
-     * @param parserContext current parsing context
-     */
-    protected void processSecurityConfig(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-        RuntimeBeanReference trustCredential =
-                processCredential(pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE,
-                        "StartTLSTrustCredential")), parserContext);
-        if (trustCredential != null) {
-            log.debug("Data connector {} using provided SSL/TLS trust material", pluginId);
-            pluginBuilder.addPropertyValue("trustCredential", trustCredential);
-        }
-
-        RuntimeBeanReference connectionCredential =
-                processCredential(pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE,
-                        "StartTLSAuthenticationCredential")), parserContext);
-        if (connectionCredential != null) {
-            log.debug("Data connector {} using provided SSL/TLS client authentication material", pluginId);
-            pluginBuilder.addPropertyValue("connectionCredential", connectionCredential);
-        }
-
-        boolean useStartTLS = false;
-        if (pluginConfig.hasAttributeNS(null, "useStartTLS")) {
-            useStartTLS = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null, "useStartTLS"));
-        }
-        log.debug("Data connector {} use startTLS: {}", pluginId, useStartTLS);
-        pluginBuilder.addPropertyValue("useStartTLS", useStartTLS);
-    }
-
-    /**
-     * Process the LDAP result handling configuration for the LDAP data connector.
-     * 
-     * @param pluginId ID of the LDAP plugin
-     * @param pluginConfig LDAP plugin configuration element
-     * @param pluginConfigChildren child elements of the plugin
-     * @param pluginBuilder plugin builder
-     * @param parserContext current parsing context
-     */
-    protected void processResultHandlingConfig(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-        int searchTimeLimit = 3000;
-        if (pluginConfig.hasAttributeNS(null, "searchTimeLimit")) {
-            searchTimeLimit =
-                    (int) SpringConfigurationUtils.parseDurationToMillis("'searchTimeLimit' on data connector "
-                            + pluginId, pluginConfig.getAttributeNS(null, "searchTimeLimit"), 0);
-        }
-        log.debug("Data connector {} search timeout: {}ms", pluginId, searchTimeLimit);
-        pluginBuilder.addPropertyValue("searchTimeLimit", searchTimeLimit);
-
-        int maxResultSize = 1;
-        if (pluginConfig.hasAttributeNS(null, "maxResultSize")) {
-            maxResultSize = Integer.parseInt(pluginConfig.getAttributeNS(null, "maxResultSize"));
-        }
-        log.debug("Data connector {} max search result size: {}", pluginId, maxResultSize);
-        pluginBuilder.addPropertyValue("maxResultSize", maxResultSize);
-
-        boolean mergeResults = false;
-        if (pluginConfig.hasAttributeNS(null, "mergeResults")) {
-            mergeResults = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null, "mergeResults"));
-        }
-        log.debug("Data connector {} merge results: {}", pluginId, mergeResults);
-        pluginBuilder.addPropertyValue("mergeResults", mergeResults);
-
-        boolean noResultsIsError = false;
-        if (pluginConfig.hasAttributeNS(null, "noResultIsError")) {
-            noResultsIsError =
-                    XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null, "noResultIsError"));
-        }
-        log.debug("Data connector {} no results is error: {}", pluginId, noResultsIsError);
-        pluginBuilder.addPropertyValue("noResultsIsError", noResultsIsError);
-
-        boolean lowercaseAttributeNames = false;
-        if (pluginConfig.hasAttributeNS(null, "lowercaseAttributeNames")) {
-            lowercaseAttributeNames =
-                    XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null,
-                            "lowercaseAttributeNames"));
-        }
-        log.debug("Data connector {} will lower case attribute IDs: {}", pluginId, lowercaseAttributeNames);
-        pluginBuilder.addPropertyValue("lowercaseAttributeNames", lowercaseAttributeNames);
-    }
-
-    /**
-     * Process the pooling configuration for the LDAP data connector.
-     * 
-     * @param pluginId ID of the LDAP plugin
-     * @param pluginConfig LDAP plugin configuration element
-     * @param pluginConfigChildren child elements of the plugin
-     * @param pluginBuilder plugin builder
-     * @param parserContext current parsing context
-     */
-    protected void processPoolingConfig(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-
-        List<Element> poolConfigElems =
-                pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE, "ConnectionPool"));
-        if (poolConfigElems == null || poolConfigElems.size() == 0) {
-            log.debug("Data connector {} is pooling connections: {}", pluginId, false);
-            pluginBuilder.addPropertyValue("poolStrategy", new LdapPoolEmptyStrategy());
-            return;
-        }
-
-        Element poolConfigElem = poolConfigElems.get(0);
-
-        LdapPoolConfig ldapPoolConfig = new LdapPoolConfig();
-        LdapPoolVTStrategy ldapPoolStrategy = new LdapPoolVTStrategy();
-        ldapPoolStrategy.setLdapPoolConfig(ldapPoolConfig);
-        log.debug("Data connector {} is pooling connections: {}", pluginId, true);
-        pluginBuilder.addPropertyValue("poolStrategy", ldapPoolStrategy);
-
-        int poolMinSize = 0;
-        if (pluginConfig.hasAttributeNS(null, "poolInitialSize")) {
-            poolMinSize = Integer.parseInt(pluginConfig.getAttributeNS(null, "poolInitialSize"));
-            log.warn("Data connector {} using deprecated attribute poolInitialSize on <DataConnector> use minPoolSize on child <PoolConfig> instead");
-        } else if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "minPoolSize")) {
-            poolMinSize = Integer.parseInt(poolConfigElem.getAttributeNS(null, "minPoolSize"));
-        }
-        log.debug("Data connector {} pool minimum connections: {}", pluginId, poolMinSize);
-        ldapPoolConfig.setMinPoolSize(poolMinSize);
-
-        int poolMaxSize = 3;
-        if (pluginConfig.hasAttributeNS(null, "poolMaxIdleSize")) {
-            poolMaxSize = Integer.parseInt(pluginConfig.getAttributeNS(null, "poolMaxIdleSize"));
-            log.warn("Data connector {} using deprecated attribute poolMaxIdleSize on <DataConnector> use maxPoolSize on child <PoolConfig> instead");
-        } else if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "maxPoolSize")) {
-            poolMaxSize = Integer.parseInt(poolConfigElem.getAttributeNS(null, "maxPoolSize"));
-        }
-        log.debug("Data connector {} pool maximum connections: {}", pluginId, poolMaxSize);
-        ldapPoolConfig.setMaxPoolSize(poolMaxSize);
-
-        boolean blockWhenEmpty = true;
-        if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "blockWhenEmpty")) {
-            blockWhenEmpty =
-                    XMLHelper.getAttributeValueAsBoolean(poolConfigElem.getAttributeNodeNS(null, "blockWhenEmpty"));
-        }
-        log.debug("Data connector {} pool block when empty: {}", pluginId, blockWhenEmpty);
-        ldapPoolStrategy.setBlockWhenEmpty(blockWhenEmpty);
-
-        int blockWaitTime = 0;
-        if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "blockWaitTime")) {
-            blockWaitTime =
-                    (int) SpringConfigurationUtils.parseDurationToMillis("blockWaitTime",
-                            poolConfigElem.getAttributeNS(null, "blockWaitTime"), 0);
-        }
-        if(blockWaitTime == 0){
-        log.debug("Data connector {} pool block wait time: indefintely", pluginId);
-        }else{
-            log.debug("Data connector {} pool block wait time: {}ms", pluginId, blockWaitTime);
-        }
-        ldapPoolStrategy.setBlockWaitTime(blockWaitTime);
-
-        boolean poolValidatePeriodically = false;
-        if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "validatePeriodically")) {
-            poolValidatePeriodically =
-                    XMLHelper.getAttributeValueAsBoolean(poolConfigElem
-                            .getAttributeNodeNS(null, "validatePeriodically"));
-        }
-        log.debug("Data connector {} pool validate periodically: {}", pluginId, poolValidatePeriodically);
-        ldapPoolConfig.setValidatePeriodically(poolValidatePeriodically);
-
-        int poolValidateTimerPeriod = 1800000;
-        if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "validateTimerPeriod")) {
-            poolValidateTimerPeriod =
-                    (int) SpringConfigurationUtils.parseDurationToMillis("validateTimerPeriod",
-                            poolConfigElem.getAttributeNS(null, "validateTimerPeriod"), 0);
-        }
-        log.debug("Data connector {} pool validate timer period: {}ms", pluginId, poolValidateTimerPeriod);
-        ldapPoolConfig.setValidateTimerPeriod(poolValidateTimerPeriod);
-
-        String poolValidateDn = "";
-        if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "validateDN")) {
-            poolValidateDn = poolConfigElem.getAttributeNS(null, "validateDN");
-        }
-        String poolValidateFilter = "(objectClass=*)";
-        if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "validateFilter")) {
-            poolValidateFilter = poolConfigElem.getAttributeNS(null, "validateFilter");
-        }
-        LdapValidator poolValidator = new CompareLdapValidator(poolValidateDn, new SearchFilter(poolValidateFilter));
-        log.debug("Data connector {} pool validation filter: {}", pluginId, poolValidateFilter);
-        pluginBuilder.addPropertyValue("poolValidator", poolValidator);
-
-        int poolExpirationTime = 600000;
-        if (poolConfigElem != null && poolConfigElem.hasAttributeNS(null, "expirationTime")) {
-            poolExpirationTime =
-                    (int) SpringConfigurationUtils.parseDurationToMillis("expirationTime",
-                            poolConfigElem.getAttributeNS(null, "expirationTime"), 0);
-        }
-        log.debug("Data connector {} pool expiration time: {}ms", pluginId, poolExpirationTime);
-        ldapPoolConfig.setExpirationTime(poolExpirationTime);
-    }
-
-    /**
-     * Processes the cache configuration directives.
-     * 
-     * @param pluginId ID of the plugin
-     * @param pluginConfig configuration element for the plugin
-     * @param pluginBuilder builder for the plugin
-     */
-    protected void processCacheConfig(String pluginId, Element pluginConfig, BeanDefinitionBuilder pluginBuilder) {
-        boolean cacheResults = false;
-        String cacheManagerId = "shibboleth.CacheManager";
-        long cacheElementTtl = 4 * 60 * 60 * 1000;
-        int maximumCachedElements = 500;
-
-        List<Element> cacheConfigs =
-                XMLHelper.getChildElementsByTagNameNS(pluginConfig, DataConnectorNamespaceHandler.NAMESPACE,
-                        "ResultCache");
-        if (cacheConfigs != null && !cacheConfigs.isEmpty()) {
-            Element cacheConfig = cacheConfigs.get(0);
-
-            cacheResults = true;
-
-            if (cacheConfig.hasAttributeNS(null, "cacheManagerRef")) {
-                cacheManagerId = DatatypeHelper.safeTrim(cacheConfig.getAttributeNS(null, "cacheManagerRef"));
-            }
-
-            if (cacheConfig.hasAttributeNS(null, "elementTimeToLive")) {
-                cacheElementTtl =
-                        SpringConfigurationUtils.parseDurationToMillis("elementTimeToLive on data connector "
-                                + pluginId, cacheConfig.getAttributeNS(null, "elementTimeToLive"), 0);
-            }
-
-            if (cacheConfig.hasAttributeNS(null, "maximumCachedElements")) {
-                maximumCachedElements =
-                        Integer.parseInt(DatatypeHelper.safeTrim(cacheConfig.getAttributeNS(null,
-                                "maximumCachedElements")));
-            }
-        }
-
-        if (pluginConfig.hasAttributeNS(null, "cacheResults")) {
-            log.warn("Data connection {}: use of 'cacheResults' attribute is deprecated.  Use <ResultCache> instead.",
-                    pluginId);
-            cacheResults = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null, "cacheResults"));
-        }
-
-        if (cacheResults) {
-            log.debug("Data connector {} is caching results: {}", pluginId, cacheResults);
-
-            pluginBuilder.addPropertyReference("cacheManager", cacheManagerId);
-
-            log.debug("Data connector {} cache element time to live: {}ms", pluginId, cacheElementTtl);
-            pluginBuilder.addPropertyValue("cacheElementTimeToLive", cacheElementTtl);
-
-            log.debug("Data connector {} maximum number of caches elements: {}", pluginId, maximumCachedElements);
-            pluginBuilder.addPropertyValue("maximumCachedElements", maximumCachedElements);
-        }
-
-    }
-
-    /**
-     * Processes the LDAP properties provided in the configuration.
-     * 
-     * @param propertyElems LDAP properties provided in the configuration
-     * 
-     * @return LDAP properties provided in the configuration
-     */
-    protected Map<String, String> processLDAPProperties(List<Element> propertyElems) {
-        if (propertyElems == null || propertyElems.size() == 0) {
-            return null;
-        }
-
-        HashMap<String, String> properties = new HashMap<String, String>(5);
-
-        String propName;
-        String propValue;
-        for (Element propertyElem : propertyElems) {
-            propName = DatatypeHelper.safeTrimOrNullString(propertyElem.getAttributeNS(null, "name"));
-            propValue = DatatypeHelper.safeTrimOrNullString(propertyElem.getAttributeNS(null, "value"));
-            properties.put(propName, propValue);
-        }
-
-        return properties;
-    }
-
-    /**
-     * Processes a credential element.
-     * 
-     * @param credentials list containing the element to process.
-     * @param parserContext current parser context
-     * 
-     * @return the bean definition for the credential
-     */
-    protected RuntimeBeanReference processCredential(List<Element> credentials, ParserContext parserContext) {
-        if (credentials == null) {
-            return null;
-        }
-
-        Element credentialElem = credentials.get(0);
-        return SpringConfigurationUtils.parseCustomElement(credentialElem, parserContext);
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/LdapDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/LdapDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index e7aba7c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/LdapDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,678 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-
-import org.opensaml.xml.security.x509.X509Credential;
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.LdapDataConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.LdapPoolStrategy;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.TemplateEngine;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.LdapDataConnector.AUTHENTICATION_TYPE;
-import edu.vt.middleware.ldap.LdapConfig;
-import edu.vt.middleware.ldap.LdapConfig.SearchScope;
-import edu.vt.middleware.ldap.handler.BinarySearchResultHandler;
-import edu.vt.middleware.ldap.handler.CaseChangeSearchResultHandler;
-import edu.vt.middleware.ldap.handler.CaseChangeSearchResultHandler.CaseChange;
-import edu.vt.middleware.ldap.handler.ConnectionHandler.ConnectionStrategy;
-import edu.vt.middleware.ldap.handler.EntryDnSearchResultHandler;
-import edu.vt.middleware.ldap.handler.FqdnSearchResultHandler;
-import edu.vt.middleware.ldap.handler.MergeSearchResultHandler;
-import edu.vt.middleware.ldap.handler.SearchResultHandler;
-import edu.vt.middleware.ldap.pool.DefaultLdapFactory;
-import edu.vt.middleware.ldap.pool.LdapValidator;
-
-/**
- * Spring factory for creating {@link LdapDataConnector} beans.
- */
-public class LdapDataConnectorFactoryBean extends BaseDataConnectorFactoryBean {
-
-    /** Ldap pool strategy. */
-    private LdapPoolStrategy ldapPoolStrategy;
-
-    /** Ldap configuration. */
-    private LdapConfig ldapConfig = new LdapConfig();
-
-    /** Ldap connection strategy. */
-    private ConnectionStrategy connStrategy;
-
-    /** Ldap connection provider specific properties. */
-    private Map<String, String> ldapProperties;
-
-    /** Connection validator that performs compares. */
-    private LdapValidator ldapValidator;
-
-    /** Template engine used to construct filter queries. */
-    private TemplateEngine templateEngine;
-
-    /** LDAP query filter template. */
-    private String filterTemplate;
-
-    /** Name of the LDAP attributes to return. */
-    private List<String> returnAttributes;
-
-    /** Trust material used when connecting to the LDAP over SSL/TLS. */
-    private X509Credential trustCredential;
-
-    /** Client authentication material used when connecting to the LDAP over SSL/TLS. */
-    private X509Credential connectionCredential;
-
-    /** Whether to merge multiple results into a single set of attributes. */
-    private boolean mergeResults;
-
-    /** Whether a search returning no results should be considered an error. */
-    private boolean noResultsIsError;
-    
-    /** Whether LDAP attribute names used as Shibboleth attribute IDs will be lowercased. */
-    private boolean lowercaseAttributeNames;
-
-    /** Whether results should be cached. */
-    private CacheManager cacheManager;
-
-    /** Maximum number of queries to keep in the cache. */
-    private int maximumCachedElements;
-
-    /** Length of time, in milliseconds, elements are cached. */
-    private long cacheElementTtl;
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        List<SearchResultHandler> resultHandlers = new ArrayList<SearchResultHandler>();
-        resultHandlers.add(new FqdnSearchResultHandler());
-        resultHandlers.add(new EntryDnSearchResultHandler());
-        if (mergeResults) {
-            resultHandlers.add(new MergeSearchResultHandler());
-        }
-        if (lowercaseAttributeNames) {
-            final CaseChangeSearchResultHandler srh = new CaseChangeSearchResultHandler();
-            srh.setAttributeNameCaseChange(CaseChange.LOWER);
-            resultHandlers.add(srh);
-        }
-        resultHandlers.add(new BinarySearchResultHandler());
-        ldapConfig.setSearchResultHandlers(resultHandlers.toArray(new SearchResultHandler[resultHandlers.size()]));
-        ldapConfig.getConnectionHandler().setConnectionStrategy(connStrategy);
-
-        // set extra properties on the ldap config
-        if (ldapProperties != null) {
-            for (Map.Entry<String, String> entry : ldapProperties.entrySet()) {
-                ldapConfig.setEnvironmentProperties(entry.getKey(), entry.getValue());
-            }
-        }
-
-        SSLContext ctx = createSSLContext();
-        if (ctx != null) {
-            ldapConfig.setSslSocketFactory(ctx.getSocketFactory());
-        }
-
-        Cache resultsCache = null;
-        if (cacheManager != null) {
-            resultsCache = cacheManager.getCache(getPluginId());
-            if (resultsCache == null) {
-                long ttlInSeconds = cacheElementTtl / 1000;
-                resultsCache = new Cache(
-                    getPluginId(), maximumCachedElements, false, false, ttlInSeconds, ttlInSeconds);
-                cacheManager.addCache(resultsCache);
-            }
-        }
-
-        try {
-            setupPoolStrategy();
-        } catch (Exception e) {
-            logger.error("LDAP pool failed to initialize", e);
-        }
-        
-        LdapDataConnector connector = new LdapDataConnector(ldapPoolStrategy, resultsCache);
-        populateDataConnector(connector);
-        connector.setNoResultsIsError(noResultsIsError);
-        if (returnAttributes != null) {
-            connector.setReturnAttributes(returnAttributes.toArray(new String[returnAttributes.size()]));
-        }
-        connector.registerTemplate(templateEngine, filterTemplate);
-
-        return connector;
-    }
-
-    /**
-     * Initializes the LDAP factory and validator for the selected pool strategy,
-     * and initializes the pool.
-     * 
-     * @throws Exception    thrown if the pool cannot be initialized
-     */
-    protected void setupPoolStrategy() throws Exception {
-        
-        // initialize the pool
-        DefaultLdapFactory ldapFactory = new DefaultLdapFactory(ldapConfig);
-        if (ldapValidator != null) {
-            ldapFactory.setLdapValidator(ldapValidator);
-        }
-        ldapPoolStrategy.setLdapFactory(ldapFactory);
-        ldapPoolStrategy.initialize();
-    }
-    
-    /**
-     * Creates an SSLContext if either trust or key material was set.
-     * 
-     * @return the created SSL context or null if no trust or key material was provided
-     * 
-     * @throws Exception thrown if the SSLContext can not be created and initialized
-     */
-    protected SSLContext createSSLContext() throws Exception {
-        // setup trust and key managers
-        TrustManager[] sslTrustManagers = null;
-        if (trustCredential != null) {
-            try {
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
-                keystore.load(null, null);
-                for (X509Certificate c : trustCredential.getEntityCertificateChain()) {
-                    keystore.setCertificateEntry("ldap_tls_trust_" + c.getSerialNumber(), c);
-                }
-                tmf.init(keystore);
-                sslTrustManagers = tmf.getTrustManagers();
-            } catch (GeneralSecurityException e) {
-                logger.error("Error initializing trust managers", e);
-            } catch (IOException e) {
-                logger.error("Error initializing trust managers", e);
-            }
-        }
-
-        KeyManager[] sslKeyManagers = null;
-        if (connectionCredential != null) {
-            try {
-                KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-                KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
-                keystore.load(null, null);
-                keystore.setKeyEntry("ldap_tls_client_auth", connectionCredential.getPrivateKey(), "changeit"
-                        .toCharArray(), connectionCredential.getEntityCertificateChain()
-                        .toArray(new X509Certificate[0]));
-                kmf.init(keystore, "changeit".toCharArray());
-                sslKeyManagers = kmf.getKeyManagers();
-            } catch (GeneralSecurityException e) {
-                logger.error("Error initializing key managers", e);
-            } catch (IOException e) {
-                logger.error("Error initializing key managers", e);
-            }
-        }
-
-        SSLContext ctx = null;
-        if (sslTrustManagers != null || sslKeyManagers != null) {
-            ctx = SSLContext.getInstance("TLS");
-            ctx.init(sslKeyManagers, sslTrustManagers, null);
-        }
-        return ctx;
-    }
-
-    /**
-     * Gets the authentication type used when connecting to the directory.
-     * 
-     * @return authentication type used when connecting to the directory
-     */
-    public AUTHENTICATION_TYPE getAuthenticationType() {
-        return AUTHENTICATION_TYPE.getAuthenticationTypeByName(ldapConfig.getAuthtype());
-    }
-
-    /**
-     * Gets the base search DN.
-     * 
-     * @return the base search DN
-     */
-    public String getBaseDN() {
-        return this.ldapConfig.getBaseDn();
-    }
-
-    /**
-     * Gets the time to live, in milliseconds, for cache elements.
-     * 
-     * @return time to live, in milliseconds, for cache elements
-     */
-    public long getCacheElementTimeToLive() {
-        return cacheElementTtl;
-    }
-
-    /**
-     * Gets the manager for the results cache.
-     * 
-     * @return manager for the results cache
-     */
-    public CacheManager getCacheManager() {
-        return cacheManager;
-    }
-
-    /**
-     * Gets the client authentication material used when connecting to the LDAP via SSL or TLS.
-     * 
-     * @return client authentication material used when connecting to the LDAP via SSL or TLS
-     */
-    public X509Credential getConnectionCredential() {
-        return connectionCredential;
-    }
-
-    /**
-     * Gets the LDAP query filter template.
-     * 
-     * @return LDAP query filter template
-     */
-    public String getFilterTemplate() {
-        return filterTemplate;
-    }
-
-    /**
-     * Gets the LDAP connection provider specific properties.
-     * 
-     * @return LDAP connection provider specific properties
-     */
-    public Map<String, String> getLdapProperties() {
-        return ldapProperties;
-    }
-
-    /**
-     * Gets the LDAP server's URL.
-     * 
-     * @return LDAP server's URL
-     */
-    public String getLdapUrl() {
-        return ldapConfig.getLdapUrl();
-    }
-
-    /**
-     * Gets the LDAP connection strategy.
-     * 
-     * @return connection strategy
-     */
-    public ConnectionStrategy getConnectionStrategy() {
-        return connStrategy;
-    }
-
-    /**
-     * Gets the maximum number of elements that will be cached.
-     * 
-     * @return maximum number of elements that will be cached
-     */
-    public int getMaximumCachedElements() {
-        return maximumCachedElements;
-    }
-
-    /**
-     * Gets the maximum number of results to return from a query.
-     * 
-     * @return maximum number of results to return from a query
-     */
-    public int getMaxResultSize() {
-        return (int) ldapConfig.getCountLimit();
-    }
-
-    /** {@inheritDoc} */
-    public Class<?> getObjectType() {
-        return LdapDataConnector.class;
-    }
-
-    /**
-     * Gets the ldap pool strategy.
-     * 
-     * @return ldap pool strategy
-     */
-    public LdapPoolStrategy getPoolStrategy() {
-        return ldapPoolStrategy;
-    }
-
-    /**
-     * Gets the pool validator.
-     * 
-     * @return pool validator
-     */
-    public LdapValidator getPoolValidator() {
-        return ldapValidator;
-    }
-
-    /**
-     * Gets the principal DN used to bind to the directory.
-     * 
-     * @return principal DN used to bind to the directory
-     */
-    public String getPrincipal() {
-        return ldapConfig.getBindDn();
-    }
-
-    /**
-     * Gets the credential of the principal DN used to bind to the directory.
-     * 
-     * @return credential of the principal DN used to bind to the directory
-     */
-    public String getPrincipalCredential() {
-        return (String) ldapConfig.getBindCredential();
-    }
-
-    /**
-     * Gets the attributes to return from a query.
-     * 
-     * @return attributes to return from a query
-     */
-    public List<String> getReturnAttributes() {
-        return returnAttributes;
-    }
-
-    /**
-     * Gets the search scope of a query.
-     * 
-     * @return search scope of a query
-     */
-    public SearchScope getSearchScope() {
-        return ldapConfig.getSearchScope();
-    }
-
-    /**
-     * Gets the maximum amount of time, in milliseconds, to wait for a search to complete.
-     * 
-     * @return maximum amount of time, in milliseconds, to wait for a search to complete
-     */
-    public int getSearchTimeLimit() {
-        return ldapConfig.getTimeLimit();
-    }
-
-    /**
-     * Gets the template engine used to construct query filters.
-     * 
-     * @return template engine used to construct query filters
-     */
-    public TemplateEngine getTemplateEngine() {
-        return templateEngine;
-    }
-
-    /**
-     * Gets the trust material used when connecting to the LDAP via SSL or TLS.
-     * 
-     * @return trust material used when connecting to the LDAP via SSL or TLS
-     */
-    public X509Credential getTrustCredential() {
-        return trustCredential;
-    }
-
-    /**
-     * Gets whether to use StartTLS when connecting to the LDAP.
-     * 
-     * @return whether to use StartTLS when connecting to the LDAP
-     */
-    public boolean getUseStartTLS() {
-        return ldapConfig.isTlsEnabled();
-    }
-
-    /**
-     * Gets whether LDAP attribute names used as Shibboleth attribute IDs will be lowercased.
-     * 
-     * @return whether LDAP attribute names used as Shibboleth attribute IDs will be lowercased
-     */
-    public boolean isLowercaseAttributeNames() {
-        return lowercaseAttributeNames;
-    }
-
-    /**
-     * Gets whether to merge multiple results into a single result.
-     * 
-     * @return whether to merge multiple results into a single result
-     */
-    public boolean isMergeResults() {
-        return mergeResults;
-    }
-
-    /**
-     * Gets whether a query that returns no results is an error condition.
-     * 
-     * @return whether a query that returns no results is an error condition
-     */
-    public boolean isNoResultsIsError() {
-        return noResultsIsError;
-    }
-
-    /**
-     * Sets the authentication type used when connecting to the directory.
-     * 
-     * @param type authentication type used when connecting to the directory
-     */
-    public void setAuthenticationType(AUTHENTICATION_TYPE type) {
-        ldapConfig.setAuthtype(type.getAuthTypeName());
-    }
-    
-    /**
-     * Sets the base search DN.
-     * 
-     * @param dn the base search DN
-     */
-    public void setBaseDN(String dn) {
-        String trimmedDN = DatatypeHelper.safeTrimOrNullString(dn);
-        if(trimmedDN != null){
-            ldapConfig.setBaseDn(trimmedDN);
-        }else{
-            ldapConfig.setBaseDn("");
-        }
-    }
-    
-    /**
-     * Sets the time to live, in milliseconds, for cache elements.
-     * 
-     * @param ttl time to live, in milliseconds, for cache elements
-     */
-    public void setCacheElementTimeToLive(long ttl) {
-        cacheElementTtl = ttl;
-    }
-
-    /**
-     * Sets the manager for the results cache.
-     * 
-     * @param manager manager for the results cache
-     */
-    public void setCacheManager(CacheManager manager) {
-        cacheManager = manager;
-    }
-
-    /**
-     * Sets the client authentication material used when connecting to the LDAP via SSL or TLS.
-     * 
-     * @param credential client authentication material used when connecting to the LDAP via SSL or TLS
-     */
-    public void setConnectionCredential(X509Credential credential) {
-        connectionCredential = credential;
-    }
-
-    /**
-     * Sets the LDAP query filter template.
-     * 
-     * @param template LDAP query filter template
-     */
-    public void setFilterTemplate(String template) {
-        filterTemplate = DatatypeHelper.safeTrimOrNullString(template);
-    }
-
-    /**
-     * Sets the LDAP connection provider specific properties.
-     * 
-     * @param properties LDAP connection provider specific properties
-     */
-    public void setLdapProperties(Map<String, String> properties) {
-        ldapProperties = properties;
-    }
-
-    /**
-     * Sets the LDAP server's URL.
-     * 
-     * @param url LDAP server's URL
-     */
-    public void setLdapUrl(String url) {
-        ldapConfig.setLdapUrl(DatatypeHelper.safeTrimOrNullString(url));
-    }
-
-    /**
-     * Sets the LDAP connection strategy.
-     * 
-     * @param strategy connection strategy
-     */
-    public void setConnectionStrategy(ConnectionStrategy strategy) {
-        connStrategy = strategy;
-    }
-
-    /**
-     * Sets whether LDAP attribute names used as Shibboleth attribute IDs will be lowercased.
-     * 
-     * @param lowercase whether LDAP attribute names used as Shibboleth attribute IDs will be lowercased
-     */
-    public void setLowercaseAttributeNames(boolean lowercase) {
-        lowercaseAttributeNames = lowercase;
-    }
-
-    /**
-     * Sets the maximum number of elements that will be cached.
-     * 
-     * @param max maximum number of elements that will be cached
-     */
-    public void setMaximumCachedElements(int max) {
-        maximumCachedElements = max;
-    }
-
-    /**
-     * Sets the maximum number of results to return from a query.
-     * 
-     * @param max maximum number of results to return from a query
-     */
-    public void setMaxResultSize(int max) {
-        ldapConfig.setCountLimit(max);
-    }
-
-    /**
-     * Sets whether to merge multiple results into a single result.
-     * 
-     * @param merge whether to merge multiple results into a single result
-     */
-    public void setMergeResults(boolean merge) {
-        mergeResults = merge;
-    }
-
-    /**
-     * Sets whether a query that returns no results is an error condition.
-     * 
-     * @param isError whether a query that returns no results is an error condition
-     */
-    public void setNoResultsIsError(boolean isError) {
-        noResultsIsError = isError;
-    }
-
-    /**
-     * Sets the ldap pool strategy.
-     * 
-     * @param strategy to use for pooling
-     */
-    public void setPoolStrategy(LdapPoolStrategy strategy) {
-        ldapPoolStrategy = strategy;
-    }
-
-    /**
-     * Sets the validator used to validate pool connections.
-     * 
-     * @param validator validator used to validate pool connections
-     */
-    public void setPoolValidator(LdapValidator validator) {
-        ldapValidator = validator;
-    }
-
-    /**
-     * Sets the principal DN used to bind to the directory.
-     * 
-     * @param principalName principal DN used to bind to the directory
-     */
-    public void setPrincipal(String principalName) {
-        ldapConfig.setBindDn(DatatypeHelper.safeTrimOrNullString(principalName));
-    }
-
-    /**
-     * Sets the credential of the principal DN used to bind to the directory.
-     * 
-     * @param credential credential of the principal DN used to bind to the directory
-     */
-    public void setPrincipalCredential(String credential) {
-        ldapConfig.setBindCredential(DatatypeHelper.safeTrimOrNullString(credential));
-    }
-
-    /**
-     * Sets the attributes to return from a query.
-     * 
-     * @param attributes attributes to return from a query
-     */
-    public void setReturnAttributes(List<String> attributes) {
-        returnAttributes = attributes;
-    }
-
-    /**
-     * Sets the search scope of a query.
-     * 
-     * @param scope search scope of a query
-     */
-    public void setSearchScope(SearchScope scope) {
-        ldapConfig.setSearchScope(scope);
-    }
-
-    /**
-     * Sets the maximum amount of time, in milliseconds, to wait for a search to complete.
-     * 
-     * @param timeLimit maximum amount of time, in milliseconds, to wait for a search to complete
-     */
-    public void setSearchTimeLimit(int timeLimit) {
-        ldapConfig.setTimeLimit(timeLimit);
-    }
-
-    /**
-     * Sets the template engine used to construct query filters.
-     * 
-     * @param engine template engine used to construct query filters
-     */
-    public void setTemplateEngine(TemplateEngine engine) {
-        templateEngine = engine;
-    }
-
-    /**
-     * Sets the trust material used when connecting to the LDAP via SSL or TLS.
-     * 
-     * @param credential trust material used when connecting to the LDAP via SSL or TLS
-     */
-    public void setTrustCredential(X509Credential credential) {
-        trustCredential = credential;
-    }
-
-    /**
-     * Sets whether to use StartTLS when connecting to the LDAP.
-     * 
-     * @param startTLS whether to use StartTLS when connecting to the LDAP
-     */
-    public void setUseStartTLS(boolean startTLS) {
-        ldapConfig.setTls(startTLS);
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/RDBMSDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/RDBMSDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 99b4aa3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/RDBMSDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.beans.PropertyVetoException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.RDBMSColumnDescriptor;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.RDBMSDataConnector.DATA_TYPES;
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for reading relational database data connector. */
-public class RDBMSDataConnectorBeanDefinitionParser extends BaseDataConnectorBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "RelationalDatabase");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(RDBMSDataConnectorBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return RDBMSDataConnectorFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        processConnectionManagement(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        processQueryHandlingConfig(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        processResultHandlingConfig(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        processCacheConfig(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-    }
-
-    /**
-     * Processes the connection management configuration.
-     * 
-     * @param pluginId ID of the data connector
-     * @param pluginConfig configuration element for the data connector
-     * @param pluginConfigChildren child config elements for the data connect
-     * @param pluginBuilder builder of the data connector
-     * @param parserContext current configuration parsing context
-     */
-    protected void processConnectionManagement(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-        DataSource datasource;
-        List<Element> cmc = pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE,
-                "ContainerManagedConnection"));
-        if (cmc != null && cmc.get(0) != null) {
-            datasource = buildContainerManagedConnection(pluginId, cmc.get(0));
-        } else {
-            datasource = buildApplicationManagedConnection(pluginId, pluginConfigChildren.get(
-                    new QName(DataConnectorNamespaceHandler.NAMESPACE, "ApplicationManagedConnection")).get(0));
-        }
-
-        pluginBuilder.addPropertyValue("connectionDataSource", datasource);
-    }
-
-    /**
-     * Builds a JDBC {@link DataSource} from a ContainerManagedConnection configuration element.
-     * 
-     * @param pluginId ID of this data connector
-     * @param cmc the container managed configuration element
-     * 
-     * @return the built data source
-     */
-    protected DataSource buildContainerManagedConnection(String pluginId, Element cmc) {
-        String jndiResource = cmc.getAttributeNS(null, "resourceName");
-        jndiResource = DatatypeHelper.safeTrim(jndiResource);
-
-        Hashtable<String, String> initCtxProps = buildProperties(XMLHelper.getChildElementsByTagNameNS(cmc,
-                DataConnectorNamespaceHandler.NAMESPACE, "JNDIConnectionProperty"));
-        try {
-            InitialContext initCtx = new InitialContext(initCtxProps);
-            DataSource dataSource = (DataSource) initCtx.lookup(jndiResource);
-            if (dataSource == null) {
-                log.error("DataSource " + jndiResource + " did not exist in JNDI directory");
-                throw new BeanCreationException("DataSource " + jndiResource + " did not exist in JNDI directory");
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("Retrieved data source for data connector {} from JNDI location {} using properties ",
-                        pluginId, initCtxProps);
-            }
-            return dataSource;
-        } catch (NamingException e) {
-            log.error("Unable to retrieve data source for data connector " + pluginId + " from JNDI location "
-                    + jndiResource + " using properties " + initCtxProps, e);
-            return null;
-        }
-    }
-
-    /**
-     * Builds a JDBC {@link DataSource} from an ApplicationManagedConnection configuration element.
-     * 
-     * @param pluginId ID of this data connector
-     * @param amc the application managed configuration element
-     * 
-     * @return the built data source
-     */
-    protected DataSource buildApplicationManagedConnection(String pluginId, Element amc) {
-        ComboPooledDataSource datasource = new ComboPooledDataSource();
-
-        String driverClass = DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcDriver"));
-        ClassLoader classLoader = this.getClass().getClassLoader();
-        try {
-            classLoader.loadClass(driverClass);
-        } catch (ClassNotFoundException e) {
-            log.error("Unable to create relational database connector, JDBC driver can not be found on the classpath");
-            throw new BeanCreationException(
-                    "Unable to create relational database connector, JDBC driver can not be found on the classpath");
-        }
-
-        try {
-            datasource.setDriverClass(driverClass);
-            datasource.setJdbcUrl(DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcURL")));
-            datasource.setUser(DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcUserName")));
-            datasource.setPassword(DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcPassword")));
-
-            if (amc.hasAttributeNS(null, "poolAcquireIncrement")) {
-                datasource.setAcquireIncrement(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolAcquireIncrement"))));
-            } else {
-                datasource.setAcquireIncrement(3);
-            }
-
-            if (amc.hasAttributeNS(null, "poolAcquireRetryAttempts")) {
-                datasource.setAcquireRetryAttempts(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolAcquireRetryAttempts"))));
-            } else {
-                datasource.setAcquireRetryAttempts(36);
-            }
-
-            if (amc.hasAttributeNS(null, "poolAcquireRetryDelay")) {
-                datasource.setAcquireRetryDelay(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolAcquireRetryDelay"))));
-            } else {
-                datasource.setAcquireRetryDelay(5000);
-            }
-
-            if (amc.hasAttributeNS(null, "poolBreakAfterAcquireFailure")) {
-                datasource.setBreakAfterAcquireFailure(XMLHelper.getAttributeValueAsBoolean(amc.getAttributeNodeNS(
-                        null, "poolBreakAfterAcquireFailure")));
-            } else {
-                datasource.setBreakAfterAcquireFailure(true);
-            }
-
-            if (amc.hasAttributeNS(null, "poolMinSize")) {
-                datasource.setMinPoolSize(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolMinSize"))));
-            } else {
-                datasource.setMinPoolSize(2);
-            }
-
-            if (amc.hasAttributeNS(null, "poolMaxSize")) {
-                datasource.setMaxPoolSize(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolMaxSize"))));
-            } else {
-                datasource.setMaxPoolSize(50);
-            }
-
-            if (amc.hasAttributeNS(null, "poolMaxIdleTime")) {
-                datasource.setMaxIdleTime(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolMaxIdleTime"))));
-            } else {
-                datasource.setMaxIdleTime(600);
-            }
-
-            if (amc.hasAttributeNS(null, "poolIdleTestPeriod")) {
-                datasource.setIdleConnectionTestPeriod(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(
-                        null, "poolIdleTestPeriod"))));
-            } else {
-                datasource.setIdleConnectionTestPeriod(180);
-            }
-
-            log.debug("Created application managed data source for data connector {}", pluginId);
-            return datasource;
-        } catch (PropertyVetoException e) {
-            log.error("Unable to create data source for data connector {} with JDBC driver class {}", pluginId,
-                    driverClass);
-            return null;
-        }
-    }
-
-    /**
-     * Processes query handling related configuration options.
-     * 
-     * @param pluginId ID of the data connector
-     * @param pluginConfig configuration element for the data connector
-     * @param pluginConfigChildren child config elements for the data connect
-     * @param pluginBuilder builder of the data connector
-     * @param parserContext current configuration parsing context
-     */
-    protected void processQueryHandlingConfig(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-        String templateEngineRef = pluginConfig.getAttributeNS(null, "templateEngine");
-        pluginBuilder.addPropertyReference("templateEngine", templateEngineRef);
-
-        List<Element> queryTemplateElems = pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE,
-                "QueryTemplate"));
-        String queryTemplate = queryTemplateElems.get(0).getTextContent();
-        log.debug("Data connector {} query template: {}", pluginId, queryTemplate);
-        pluginBuilder.addPropertyValue("queryTemplate", queryTemplate);
-
-        long queryTimeout = 5 * 1000;
-        if (pluginConfig.hasAttributeNS(null, "queryTimeout")) {
-            queryTimeout = SpringConfigurationUtils.parseDurationToMillis(
-                    "queryTimeout on relational database connector " + pluginId, pluginConfig.getAttributeNS(null,
-                            "queryTimeout"), 0);
-        }
-        log.debug("Data connector {} SQL query timeout: {}ms", pluginId, queryTimeout);
-        pluginBuilder.addPropertyValue("queryTimeout", queryTimeout);
-
-        boolean useSP = false;
-        if (pluginConfig.hasAttributeNS(null, "queryUsesStoredProcedure")) {
-            useSP = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null,
-                    "queryUsesStoredProcedure"));
-        }
-        log.debug("Data connector {} query uses stored procedures: {}", pluginId, useSP);
-        pluginBuilder.addPropertyValue("queryUsesStoredProcedures", useSP);
-
-        boolean readOnlyCtx = true;
-        if (pluginConfig.hasAttributeNS(null, "readOnlyConnection")) {
-            readOnlyCtx = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null,
-                    "readOnlyConnection"));
-        }
-        log.debug("Data connector {} connections are read only: {}", pluginId, readOnlyCtx);
-        pluginBuilder.addPropertyValue("readOnlyConnections", readOnlyCtx);
-
-    }
-
-    /**
-     * Processes the result handling configuration options.
-     * 
-     * @param pluginId ID of the data connector
-     * @param pluginConfig configuration element for the data connector
-     * @param pluginConfigChildren child config elements for the data connect
-     * @param pluginBuilder builder of the data connector
-     * @param parserContext current configuration parsing context
-     */
-    protected void processResultHandlingConfig(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-
-        List<RDBMSColumnDescriptor> descriptors = processColumnDescriptors(pluginId, pluginConfigChildren,
-                pluginBuilder);
-        pluginBuilder.addPropertyValue("columnDescriptors", descriptors);
-
-        boolean noResultsIsError = false;
-        if (pluginConfig.hasAttributeNS(null, "noResultIsError")) {
-            noResultsIsError = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null,
-                    "noResultIsError"));
-        }
-        log.debug("Data connector {} no results is error: {}", pluginId, noResultsIsError);
-        pluginBuilder.addPropertyValue("noResultIsError", noResultsIsError);
-    }
-
-    /**
-     * Processes the cache configuration options.
-     * 
-     * @param pluginId ID of the data connector
-     * @param pluginConfig configuration element for the data connector
-     * @param pluginConfigChildren child config elements for the data connect
-     * @param pluginBuilder builder of the data connector
-     * @param parserContext current configuration parsing context
-     */
-    protected void processCacheConfig(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-        boolean cacheResults = false;
-        String cacheManagerId = "shibboleth.CacheManager";
-        long cacheElementTtl = 4 * 60 * 60 * 1000;
-        int maximumCachedElements = 500;
-
-        List<Element> cacheConfigs = XMLHelper.getChildElementsByTagNameNS(pluginConfig,
-                DataConnectorNamespaceHandler.NAMESPACE, "ResultCache");
-        if (cacheConfigs != null && !cacheConfigs.isEmpty()) {
-            Element cacheConfig = cacheConfigs.get(0);
-
-            cacheResults = true;
-
-            if (cacheConfig.hasAttributeNS(null, "cacheManagerRef")) {
-                cacheManagerId = DatatypeHelper.safeTrim(cacheConfig.getAttributeNS(null, "cacheManagerRef"));
-            }
-
-            if (cacheConfig.hasAttributeNS(null, "elementTimeToLive")) {
-                cacheElementTtl = SpringConfigurationUtils.parseDurationToMillis("elementTimeToLive on data connector "
-                        + pluginId, cacheConfig.getAttributeNS(null, "elementTimeToLive"), 0);
-            }
-
-            if (cacheConfig.hasAttributeNS(null, "maximumCachedElements")) {
-                maximumCachedElements = Integer.parseInt(DatatypeHelper.safeTrim(cacheConfig.getAttributeNS(null,
-                        "maximumCachedElements")));
-            }
-        }
-
-        if (pluginConfig.hasAttributeNS(null, "cacheResults")) {
-            log.warn("Data connection {}: use of 'cacheResults' attribute is deprecated.  Use <ResultCache> instead.",
-                    pluginId);
-            cacheResults = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null, "cacheResults"));
-        }
-
-        if (cacheResults) {
-            log.debug("Data connector {} is caching results: {}", pluginId, cacheResults);
-
-            pluginBuilder.addPropertyReference("cacheManager", cacheManagerId);
-
-            log.debug("Data connector {} cache element time to live: {}ms", pluginId, cacheElementTtl);
-            pluginBuilder.addPropertyValue("cacheElementTimeToLive", cacheElementTtl);
-
-            log.debug("Data connector {} maximum number of caches elements: {}", pluginId, maximumCachedElements);
-            pluginBuilder.addPropertyValue("maximumCachedElements", maximumCachedElements);
-        }
-
-    }
-
-    /**
-     * Processes the Column descriptor configuration elements.
-     * 
-     * @param pluginId ID of this data connector
-     * @param pluginConfigChildren configuration elements
-     * @param pluginBuilder the bean definition parser
-     * 
-     * @return result set column descriptors
-     */
-    protected List<RDBMSColumnDescriptor> processColumnDescriptors(String pluginId,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder) {
-        List<RDBMSColumnDescriptor> columnDescriptors = new ArrayList<RDBMSColumnDescriptor>();
-
-        QName columnElementName = new QName(DataConnectorNamespaceHandler.NAMESPACE, "Column");
-
-        RDBMSColumnDescriptor columnDescriptor;
-        String columnName;
-        String attributeId;
-        String dataType;
-        if (pluginConfigChildren.containsKey(columnElementName)) {
-            for (Element columnElem : pluginConfigChildren.get(columnElementName)) {
-                columnName = columnElem.getAttributeNS(null, "columnName");
-                attributeId = columnElem.getAttributeNS(null, "attributeID");
-
-                if (columnElem.hasAttributeNS(null, "type")) {
-                    dataType = columnElem.getAttributeNS(null, "type");
-                } else {
-                    dataType = DATA_TYPES.String.toString();
-                }
-
-                columnDescriptor = new RDBMSColumnDescriptor(columnName, attributeId, DATA_TYPES.valueOf(dataType));
-                columnDescriptors.add(columnDescriptor);
-            }
-            log.debug("Data connector {} column descriptors: {}", pluginId, columnDescriptors);
-        }
-
-        return columnDescriptors;
-    }
-
-    /**
-     * Builds a hash from PropertyType elements.
-     * 
-     * @param propertyElements properties elements
-     * 
-     * @return properties extracted from elements, key is the property name.
-     */
-    protected Hashtable<String, String> buildProperties(List<Element> propertyElements) {
-        if (propertyElements == null || propertyElements.size() < 1) {
-            return null;
-        }
-
-        Hashtable<String, String> properties = new Hashtable<String, String>();
-
-        String propName;
-        String propValue;
-        for (Element propertyElement : propertyElements) {
-            propName = DatatypeHelper.safeTrim(propertyElement.getAttributeNS(null, "name"));
-            propValue = DatatypeHelper.safeTrim(propertyElement.getAttributeNS(null, "value"));
-            properties.put(propName, propValue);
-        }
-
-        return properties;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/RDBMSDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/RDBMSDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index 17e027c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/RDBMSDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.RDBMSColumnDescriptor;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.RDBMSDataConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.TemplateEngine;
-
-/**
- * Spring factory bean that produces {@link RDBMSDataConnector}s.
- */
-public class RDBMSDataConnectorFactoryBean extends BaseDataConnectorFactoryBean {
-
-    /** Source of connections to the database. */
-    private DataSource connectionDataSource;
-
-    /** Template engine used to transform query templates into queries. */
-    private TemplateEngine templateEngine;
-
-    /** SQL query template. */
-    private String queryTemplate;
-    
-    /** SQL query timeout in milliseconds. */
-    private long queryTimeout;
-
-    /** Whether the database connections should be read-only. */
-    private boolean readOnlyConnections;
-
-    /** Whether the SQL query uses stored procedures. */
-    private boolean queryUsesStoredProcedures;
-
-    /** Whether an empty result set is an error. */
-    private boolean noResultsIsError;
-
-    /** Result set column descriptors. */
-    private List<RDBMSColumnDescriptor> columnDescriptors;
-    
-    /** Whether results should be cached. */
-    private CacheManager cacheManager;
-
-    /** Maximum number of queries to keep in the cache. */
-    private int maximumCachedElements;
-
-    /** Length of time, in milliseconds, elements are cached. */
-    private long cacheElementTtl;
-
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return RDBMSDataConnector.class;
-    }
-
-    /**
-     * This returns whether this connector will throw an exception if no search results are found. The default is false.
-     * 
-     * @return <code>boolean</code>
-     */
-    public boolean isNoResultIsError() {
-        return noResultsIsError;
-    }
-
-    /**
-     * This sets whether this connector will throw an exception if no search results are found.
-     * 
-     * @param b <code>boolean</code>
-     */
-    public void setNoResultIsError(boolean b) {
-        noResultsIsError = b;
-    }
-
-    /**
-     * Gets the result set column descriptors.
-     * 
-     * @return result set column descriptors
-     */
-    public List<RDBMSColumnDescriptor> getColumnDescriptors() {
-        return columnDescriptors;
-    }
-
-    /**
-     * Sets the result set column descriptors.
-     * 
-     * @param descriptors result set column descriptors
-     */
-    public void setColumnDescriptors(List<RDBMSColumnDescriptor> descriptors) {
-        columnDescriptors = descriptors;
-    }
-
-    /**
-     * Gets the database connection source.
-     * 
-     * @return database connection source.
-     */
-    public DataSource getConnectionDataSource() {
-        return connectionDataSource;
-    }
-
-    /**
-     * Sets the database connection source.
-     * 
-     * @param source database connection source
-     */
-    public void setConnectionDataSource(DataSource source) {
-        connectionDataSource = source;
-    }
-
-    /**
-     * Gets the template engine used to construct the SQL query from the query template.
-     * 
-     * @return template engine used to construct the SQL query from the query template
-     */
-    public TemplateEngine getTemplateEngine() {
-        return templateEngine;
-    }
-
-    /**
-     * Sets the template engine used to construct the SQL query from the query template.
-     * 
-     * @param engine template engine used to construct the SQL query from the query template
-     */
-    public void setTemplateEngine(TemplateEngine engine) {
-        templateEngine = engine;
-    }
-
-    /**
-     * Gets the SQL query template.
-     * 
-     * @return SQL query template
-     */
-    public String getQueryTemplate() {
-        return queryTemplate;
-    }
-
-    /**
-     * Sets the SQL query template.
-     * 
-     * @param template SQL query template
-     */
-    public void setQueryTemplate(String template) {
-        queryTemplate = DatatypeHelper.safeTrimOrNullString(template);
-    }
-    
-    /**
-     * Gets the timeout, in milliseconds, of the SQL query.
-     * 
-     * @return timeout, in milliseconds, of the SQL query.
-     */
-    public long getQueryTimeout() {
-        return queryTimeout;
-    }
-    
-    /**
-     * Sets the timeout, in milliseconds, of the SQL query.
-     * 
-     * @param timeout timeout, in milliseconds, of the SQL query.
-     */
-    public void setQueryTimeout(long timeout) {
-        queryTimeout = timeout;
-    }
-
-    /**
-     * Gets whether the SQL query uses stored procedures.
-     * 
-     * @return whether the SQL query uses stored procedures
-     */
-    public boolean getQueryUsesStoredProcedures() {
-        return queryUsesStoredProcedures;
-    }
-
-    /**
-     * Sets whether the SQL query uses stored procedures.
-     * 
-     * @param storedProcedures whether the SQL query uses stored procedures
-     */
-    public void setQueryUsesStoredProcedures(boolean storedProcedures) {
-        queryUsesStoredProcedures = storedProcedures;
-    }
-
-    /**
-     * Gets the manager for the results cache.
-     * 
-     * @return manager for the results cache
-     */
-    public CacheManager getCacheManager() {
-        return cacheManager;
-    }
-
-    /**
-     * Sets the manager for the results cache.
-     * 
-     * @param manager manager for the results cache
-     */
-    public void setCacheManager(CacheManager manager) {
-        cacheManager = manager;
-    }
-
-    /**
-     * Gets the time to live, in milliseconds, for cache elements.
-     * 
-     * @return time to live, in milliseconds, for cache elements
-     */
-    public long getCacheElementTimeToLive() {
-        return cacheElementTtl;
-    }
-
-    /**
-     * Sets the time to live, in milliseconds, for cache elements.
-     * 
-     * @param ttl time to live, in milliseconds, for cache elements
-     */
-    public void setCacheElementTimeToLive(long ttl) {
-        cacheElementTtl = ttl;
-    }
-
-    /**
-     * Gets the maximum number of elements that will be cached.
-     * 
-     * @return maximum number of elements that will be cached
-     */
-    public int getMaximumCachedElements() {
-        return maximumCachedElements;
-    }
-
-    /**
-     * Sets the maximum number of elements that will be cached.
-     * 
-     * @param max maximum number of elements that will be cached
-     */
-    public void setMaximumCachedElements(int max) {
-        maximumCachedElements = max;
-    }
-
-    /**
-     * Gets whether the database connection is read-only.
-     * 
-     * @return whether the database connection is read-only
-     */
-    public boolean isReadOnlyConnections() {
-        return readOnlyConnections;
-    }
-
-    /**
-     * Sets whether the database connection is read-only.
-     * 
-     * @param readOnly whether the database connection is read-only
-     */
-    public void setReadOnlyConnections(boolean readOnly) {
-        readOnlyConnections = readOnly;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        Cache resultsCache = null;
-        if (cacheManager != null) {
-            resultsCache = cacheManager.getCache(getPluginId());
-            if (resultsCache == null) {
-                long ttlInSeconds = cacheElementTtl / 1000;
-                resultsCache = new Cache(
-                    getPluginId(), maximumCachedElements, false, false, ttlInSeconds, ttlInSeconds);
-                cacheManager.addCache(resultsCache);
-            }
-        }
-
-        RDBMSDataConnector connector = new RDBMSDataConnector(getConnectionDataSource(), resultsCache);
-        populateDataConnector(connector);
-        connector.registerTemplate(templateEngine, queryTemplate);
-
-        connector.setQueryTimeout((int) (queryTimeout/1000));
-        connector.setUsesStoredProcedure(getQueryUsesStoredProcedures());
-        connector.setConnectionReadOnly(isReadOnlyConnections());
-        connector.setNoResultIsError(isNoResultIsError());
-
-        if (getColumnDescriptors() != null) {
-            Map<String, RDBMSColumnDescriptor> columnDecriptors = connector.getColumnDescriptor();
-            for (RDBMSColumnDescriptor descriptor : getColumnDescriptors()) {
-                columnDecriptors.put(descriptor.getColumnName(), descriptor);
-            }
-        }
-
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StaticDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StaticDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ada518f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StaticDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-
-/**
- * Spring Bean Definition Parser for static data connector.
- */
-public class StaticDataConnectorBeanDefinitionParser extends BaseDataConnectorBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "Static");
-
-    /** Local name of attribute. */
-    public static final QName ATTRIBUTE_ELEMENT_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE,
-            "Attribute");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return StaticDataConnectorFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        List<BaseAttribute<String>> attributes = processAttributes(pluginConfigChildren.get(ATTRIBUTE_ELEMENT_NAME));
-
-        pluginBuilder.addPropertyValue("staticAttributes", attributes);
-    }
-
-    /**
-     * Parses the configuration elements defining the static {@link BaseAttribute}s.
-     * 
-     * @param attributeElems configuration elements defining the static {@link BaseAttribute}s
-     * 
-     * @return the static {@link BaseAttribute}s
-     */
-    protected List<BaseAttribute<String>> processAttributes(List<Element> attributeElems) {
-        if (attributeElems == null || attributeElems.size() == 0) {
-            return null;
-        }
-
-        List<BaseAttribute<String>> attributes = new ArrayList<BaseAttribute<String>>();
-        BasicAttribute<String> attribute;
-        for (Element attributeElem : attributeElems) {
-            attribute = new BasicAttribute<String>(DatatypeHelper.safeTrimOrNullString(attributeElem.getAttributeNS(
-                    null, "id")));
-            for (Element valueElem : XMLHelper.getChildElementsByTagNameNS(attributeElem,
-                    DataConnectorNamespaceHandler.NAMESPACE, "Value")) {
-                attribute.getValues().add(valueElem.getTextContent());
-            }
-
-            attributes.add(attribute);
-        }
-
-        return attributes;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StaticDataConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StaticDataConnectorFactoryBean.java.svn-base
deleted file mode 100644
index 4a6d55a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StaticDataConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.util.List;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StaticDataConnector;
-
-/**
- * Spring bean factory that produces {@link StaticDataConnector}s.
- */
-public class StaticDataConnectorFactoryBean extends BaseDataConnectorFactoryBean {
-
-    /** Static attributes returned by the created data connector. */
-    private List<BaseAttribute<String>> staticAttributes;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return StaticDataConnector.class;
-    }
-
-    /**
-     * Gets the static attributes returned by the created data connector.
-     * 
-     * @return static attributes returned by the created data connector
-     */
-    public List<BaseAttribute<String>> getStaticAttributes() {
-        return staticAttributes;
-    }
-
-    /**
-     * Sets the static attributes returned by the created data connector.
-     * 
-     * @param attributes static attributes returned by the created data connector
-     */
-    public void setStaticAttributes(List<BaseAttribute<String>> attributes) {
-        staticAttributes = attributes;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        StaticDataConnector connector = new StaticDataConnector(staticAttributes);
-        populateDataConnector(connector);
-
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StoredIDDataConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StoredIDDataConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index dff036c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StoredIDDataConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import java.beans.PropertyVetoException;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for stored ID data connector.
- */
-public class StoredIDDataConnectorBeanDefinitionParser extends BaseDataConnectorBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "StoredId");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StoredIDDataConnectorBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return StoredIDDataConnectorBeanFactory.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        processConnectionManagement(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        long queryTimeout = 5 * 1000;
-        if (pluginConfig.hasAttributeNS(null, "queryTimeout")) {
-            queryTimeout = SpringConfigurationUtils.parseDurationToMillis(
-                    "queryTimeout on relational database connector " + pluginId, pluginConfig.getAttributeNS(null,
-                            "queryTimeout"), 0);
-        }
-        log.debug("Data connector {} SQL query timeout: {}ms", queryTimeout);
-        pluginBuilder.addPropertyValue("queryTimeout", queryTimeout);
-
-        String generatedAttributeId = "storedId";
-        if (pluginConfig.hasAttributeNS(null, "generatedAttributeID")) {
-            generatedAttributeId = DatatypeHelper.safeTrimOrNullString(pluginConfig.getAttributeNS(null,
-                    "generatedAttributeID"));
-        }
-        pluginBuilder.addPropertyValue("generatedAttribute", generatedAttributeId);
-        log.debug("Data connector {} generated attribute ID: {}", pluginId, generatedAttributeId);
-
-        String sourceAttribute = DatatypeHelper.safeTrimOrNullString(pluginConfig.getAttributeNS(null,
-                "sourceAttributeID"));
-        log.debug("Data connector {} source attribute ID: {}", pluginId, sourceAttribute);
-        pluginBuilder.addPropertyValue("sourceAttribute", sourceAttribute);
-
-        String salt = DatatypeHelper.safeTrimOrNullString(pluginConfig.getAttributeNS(null, "salt"));
-        log.debug("Data connector {} salt: {}", pluginId, salt);
-        pluginBuilder.addPropertyValue("salt", salt.getBytes());
-    }
-
-    /**
-     * Processes the connection management configuration.
-     * 
-     * @param pluginId ID of this data connector
-     * @param pluginConfig configuration element for this data connector
-     * @param pluginConfigChildren configuration elements for this connector
-     * @param pluginBuilder bean definition builder
-     * @param parserContext current configuration parsing context
-     */
-    protected void processConnectionManagement(String pluginId, Element pluginConfig,
-            Map<QName, List<Element>> pluginConfigChildren, BeanDefinitionBuilder pluginBuilder,
-            ParserContext parserContext) {
-        DataSource datasource;
-
-        List<Element> cmc = pluginConfigChildren.get(new QName(DataConnectorNamespaceHandler.NAMESPACE,
-                "ContainerManagedConnection"));
-        if (cmc != null && cmc.get(0) != null) {
-            datasource = buildContainerManagedConnection(pluginId, cmc.get(0));
-        } else {
-            datasource = buildApplicationManagedConnection(pluginId, pluginConfigChildren.get(
-                    new QName(DataConnectorNamespaceHandler.NAMESPACE, "ApplicationManagedConnection")).get(0));
-        }
-
-        pluginBuilder.addPropertyValue("datasource", datasource);
-    }
-
-    /**
-     * Builds a JDBC {@link DataSource} from a ContainerManagedConnection configuration element.
-     * 
-     * @param pluginId ID of this data connector
-     * @param cmc the container managed configuration element
-     * 
-     * @return the built data source
-     */
-    protected DataSource buildContainerManagedConnection(String pluginId, Element cmc) {
-        String jndiResource = cmc.getAttributeNS(null, "resourceName");
-        jndiResource = DatatypeHelper.safeTrim(jndiResource);
-
-        Hashtable<String, String> initCtxProps = buildProperties(XMLHelper.getChildElementsByTagNameNS(cmc,
-                DataConnectorNamespaceHandler.NAMESPACE, "JNDIConnectionProperty"));
-        try {
-            InitialContext initCtx = new InitialContext(initCtxProps);
-            DataSource dataSource = (DataSource) initCtx.lookup(jndiResource);
-            if (dataSource == null) {
-                log.error("DataSource " + jndiResource + " did not exist in JNDI directory");
-                throw new BeanCreationException("DataSource " + jndiResource + " did not exist in JNDI directory");
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("Retrieved data source for data connector {} from JNDI location {} using properties ",
-                        pluginId, initCtxProps);
-            }
-            return dataSource;
-        } catch (NamingException e) {
-            log.error("Unable to retrieve data source for data connector " + pluginId + " from JNDI location "
-                    + jndiResource + " using properties " + initCtxProps, e);
-            return null;
-        }
-    }
-
-    /**
-     * Builds a JDBC {@link DataSource} from an ApplicationManagedConnection configuration element.
-     * 
-     * @param pluginId ID of this data connector
-     * @param amc the application managed configuration element
-     * 
-     * @return the built data source
-     */
-    protected DataSource buildApplicationManagedConnection(String pluginId, Element amc) {
-        ComboPooledDataSource datasource = new ComboPooledDataSource();
-
-        String driverClass = DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcDriver"));
-        ClassLoader classLoader = this.getClass().getClassLoader();
-        try {
-            classLoader.loadClass(driverClass);
-        } catch (ClassNotFoundException e) {
-            log.error("Unable to create relational database connector, JDBC driver can not be found on the classpath");
-            throw new BeanCreationException(
-                    "Unable to create relational database connector, JDBC driver can not be found on the classpath");
-        }
-
-        try {
-            datasource.setDriverClass(driverClass);
-            datasource.setJdbcUrl(DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcURL")));
-            datasource.setUser(DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcUserName")));
-            datasource.setPassword(DatatypeHelper.safeTrim(amc.getAttributeNS(null, "jdbcPassword")));
-
-            if (amc.hasAttributeNS(null, "poolAcquireIncrement")) {
-                datasource.setAcquireIncrement(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolAcquireIncrement"))));
-            } else {
-                datasource.setAcquireIncrement(3);
-            }
-
-            if (amc.hasAttributeNS(null, "poolAcquireRetryAttempts")) {
-                datasource.setAcquireRetryAttempts(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolAcquireRetryAttempts"))));
-            } else {
-                datasource.setAcquireRetryAttempts(36);
-            }
-
-            if (amc.hasAttributeNS(null, "poolAcquireRetryDelay")) {
-                datasource.setAcquireRetryDelay(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolAcquireRetryDelay"))));
-            } else {
-                datasource.setAcquireRetryDelay(5000);
-            }
-
-            if (amc.hasAttributeNS(null, "poolBreakAfterAcquireFailure")) {
-                datasource.setBreakAfterAcquireFailure(XMLHelper.getAttributeValueAsBoolean(amc.getAttributeNodeNS(
-                        null, "poolBreakAfterAcquireFailure")));
-            } else {
-                datasource.setBreakAfterAcquireFailure(true);
-            }
-
-            if (amc.hasAttributeNS(null, "poolMinSize")) {
-                datasource.setMinPoolSize(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolMinSize"))));
-            } else {
-                datasource.setMinPoolSize(2);
-            }
-
-            if (amc.hasAttributeNS(null, "poolMaxSize")) {
-                datasource.setMaxPoolSize(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolMaxSize"))));
-            } else {
-                datasource.setMaxPoolSize(50);
-            }
-
-            if (amc.hasAttributeNS(null, "poolMaxIdleTime")) {
-                datasource.setMaxIdleTime(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(null,
-                        "poolMaxIdleTime"))));
-            } else {
-                datasource.setMaxIdleTime(600);
-            }
-
-            if (amc.hasAttributeNS(null, "poolIdleTestPeriod")) {
-                datasource.setIdleConnectionTestPeriod(Integer.parseInt(DatatypeHelper.safeTrim(amc.getAttributeNS(
-                        null, "poolIdleTestPeriod"))));
-            } else {
-                datasource.setIdleConnectionTestPeriod(180);
-            }
-
-            datasource.setMaxStatementsPerConnection(10);
-
-            log.debug("Created application managed data source for data connector {}", pluginId);
-            return datasource;
-        } catch (PropertyVetoException e) {
-            log.error("Unable to create data source for data connector {} with JDBC driver class {}", pluginId,
-                    driverClass);
-            return null;
-        }
-    }
-
-    /**
-     * Builds a hash from PropertyType elements.
-     * 
-     * @param propertyElements properties elements
-     * 
-     * @return properties extracted from elements, key is the property name.
-     */
-    protected Hashtable<String, String> buildProperties(List<Element> propertyElements) {
-        if (propertyElements == null || propertyElements.size() < 1) {
-            return null;
-        }
-
-        Hashtable<String, String> properties = new Hashtable<String, String>();
-
-        String propName;
-        String propValue;
-        for (Element propertyElement : propertyElements) {
-            propName = DatatypeHelper.safeTrim(propertyElement.getAttributeNS(null, "name"));
-            propValue = DatatypeHelper.safeTrim(propertyElement.getAttributeNS(null, "value"));
-            properties.put(propName, propValue);
-        }
-
-        return properties;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StoredIDDataConnectorBeanFactory.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StoredIDDataConnectorBeanFactory.java.svn-base
deleted file mode 100644
index 3c1ff6f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/.svn/text-base/StoredIDDataConnectorBeanFactory.java.svn-base
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector;
-
-import javax.sql.DataSource;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StoredIDDataConnector;
-
-/** Spring factory bean for {@link StoredIDDataConnector}s. */
-public class StoredIDDataConnectorBeanFactory extends BaseDataConnectorFactoryBean {
-
-    /** Datasource used to communicate with database. */
-    private DataSource datasource;
-
-    /** SQL query timeout in milliseconds. */
-    private long queryTimeout;
-
-    /** ID of the attribute generated by the connector. */
-    private String generatedAttribute;
-
-    /** ID of the attribute whose first value is used when generating the computed ID. */
-    private String sourceAttribute;
-
-    /** Salt used when computing the ID. */
-    private byte[] salt;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return StoredIDDataConnector.class;
-    }
-
-    /**
-     * Gets the datasource used to communicate with database.
-     * 
-     * @return datasource used to communicate with database
-     */
-    public DataSource getDatasource() {
-        return datasource;
-    }
-
-    /**
-     * Sets the datasource used to communicate with database.
-     * 
-     * @param source datasource used to communicate with database
-     */
-    public void setDatasource(DataSource source) {
-        datasource = source;
-    }
-
-    /**
-     * Gets the timeout, in milliseconds, of the SQL query.
-     * 
-     * @return timeout, in milliseconds, of the SQL query.
-     */
-    public long getQueryTimeout() {
-        return queryTimeout;
-    }
-
-    /**
-     * Sets the timeout, in milliseconds, of the SQL query.
-     * 
-     * @param timeout timeout, in milliseconds, of the SQL query.
-     */
-    public void setQueryTimeout(long timeout) {
-        queryTimeout = timeout;
-    }
-
-    /**
-     * Gets the ID of the attribute generated by the connector.
-     * 
-     * @return ID of the attribute generated by the connector
-     */
-    public String getGeneratedAttribute() {
-        return generatedAttribute;
-    }
-
-    /**
-     * Sets the ID of the attribute generated by the connector.
-     * 
-     * @param id ID of the attribute generated by the connector
-     */
-    public void setGeneratedAttribute(String id) {
-        generatedAttribute = id;
-    }
-
-    /**
-     * Gets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @return ID of the attribute whose first value is used when generating the computed ID
-     */
-    public String getSourceAttribute() {
-        return sourceAttribute;
-    }
-
-    /**
-     * Sets the ID of the attribute whose first value is used when generating the computed ID.
-     * 
-     * @param id ID of the attribute whose first value is used when generating the computed ID
-     */
-    public void setSourceAttribute(String id) {
-        this.sourceAttribute = id;
-    }
-
-    /**
-     * Gets the salt used when computing the ID.
-     * 
-     * @return salt used when computing the ID
-     */
-    public byte[] getSalt() {
-        return salt;
-    }
-
-    /**
-     * Sets the salt used when computing the ID.
-     * 
-     * @param salt salt used when computing the ID
-     */
-    public void setSalt(byte[] salt) {
-        this.salt = salt;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        StoredIDDataConnector connector = new StoredIDDataConnector(getDatasource(), (int) (queryTimeout / 1000),
-                getGeneratedAttribute(), getSourceAttribute(), getSalt());
-        populateDataConnector(connector);
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/all-wcprops
deleted file mode 100644
index 1ac5852..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/all-wcprops
+++ /dev/null
@@ -1,71 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 147
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector
-END
-TransientPrincipalConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 200
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/TransientPrincipalConnectorBeanDefinitionParser.java
-END
-CryptoTransientPrincipalConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/CryptoTransientPrincipalConnectorBeanDefinitionParser.java
-END
-TransientPrincipalConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 191
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/TransientPrincipalConnectorFactoryBean.java
-END
-CryptoTransientPrincipalConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 197
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/CryptoTransientPrincipalConnectorFactoryBean.java
-END
-DirectPrincipalConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 197
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/DirectPrincipalConnectorBeanDefinitionParser.java
-END
-BasePrincipalConnectrBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 194
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/BasePrincipalConnectrBeanDefinitionParser.java
-END
-BasePrincipalConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/BasePrincipalConnectorFactoryBean.java
-END
-DirectPrincipalConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 188
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/DirectPrincipalConnectorFactoryBean.java
-END
-StoredIDPrincipalConnectorBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 199
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/StoredIDPrincipalConnectorBeanDefinitionParser.java
-END
-PrincipalConnectorNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 187
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/PrincipalConnectorNamespaceHandler.java
-END
-StoredIDPrincipalConnectorFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 190
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/StoredIDPrincipalConnectorFactoryBean.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/entries
deleted file mode 100644
index c067ac9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/entries
+++ /dev/null
@@ -1,402 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-BasePrincipalConnectrBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-0e698535bfee428900c52670a4d8243b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2286
-

-BasePrincipalConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-1cbeeac9d5d27a9b056f4030086ee0f2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2443
-

-DirectPrincipalConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-25b5576ddc58002bcede19350e4a4acb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1608
-

-StoredIDPrincipalConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-bcd94e668debf0e8009f9e1d09c5487c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2584
-

-PrincipalConnectorNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-3366ddc039255d2f8672eec70d8b578b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2066
-

-StoredIDPrincipalConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-f164397057fbd1337c3dff396f102f19
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3055
-

-TransientPrincipalConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.458792Z
-c48cc143c66e54d0fb99f6cb2d5faf1b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2199
-

-CryptoTransientPrincipalConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.458792Z
-714bf20bfbc24634ade16950135aec29
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2254
-

-TransientPrincipalConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.458792Z
-6870751e8dca797b548011208e63a980
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2554
-

-CryptoTransientPrincipalConnectorFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-082a74c93032b485cc1992a3f08d61cd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2259
-

-DirectPrincipalConnectorBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:43.462792Z
-392dad8e123f32b91ce6e90b3ec40ecd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1474
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/BasePrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/BasePrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/BasePrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/BasePrincipalConnectrBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/BasePrincipalConnectrBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/BasePrincipalConnectrBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/CryptoTransientPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/DirectPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/DirectPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/DirectPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/DirectPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/DirectPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/DirectPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/PrincipalConnectorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/PrincipalConnectorNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/PrincipalConnectorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/StoredIDPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/StoredIDPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/StoredIDPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/StoredIDPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/StoredIDPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/StoredIDPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/TransientPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/TransientPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/TransientPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/TransientPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/TransientPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/prop-base/TransientPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/BasePrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/BasePrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index 20ffa70..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/BasePrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.BasePrincipalConnector;
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AbstractResolutionPluginFactoryBean;
-
-/**
- * Base Spring factory bean that produces principal connectors.
- */
-public abstract class BasePrincipalConnectorFactoryBean extends AbstractResolutionPluginFactoryBean {
-
-    /** Format of the NameID the connector operates on. */
-    private String nameIdFormat;
-
-    /**
-     * Gets the format of the NameID the connector operates on.
-     * 
-     * @return format of the NameID the connector operates on
-     */
-    public String getNameIdFormat() {
-        return nameIdFormat;
-    }
-
-    /**
-     * Sets the format of the NameID the connector operates on.
-     * 
-     * @param format format of the NameID the connector operates on
-     */
-    public void setNameIdFormat(String format) {
-        nameIdFormat = DatatypeHelper.safeTrimOrNullString(format);
-    }
-
-    /**
-     * Populates the given connector with information from this factory.
-     * 
-     * @param connector connector populates
-     */
-    protected void populatePrincipalConnector(BasePrincipalConnector connector) {
-        connector.setId(getPluginId());
-        connector.setFormat(getNameIdFormat());
-        
-        if(getDependencyIds() != null){
-            connector.getDependencyIds().addAll(getDependencyIds());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/BasePrincipalConnectrBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/BasePrincipalConnectrBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b13e0f8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/BasePrincipalConnectrBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AbstractResolutionPlugInBeanDefinitionParser;
-
-/**
- * Base spring bean definition parser for principal connectors. PrincipalConnector implementations should provide a
- * custom BeanDefinitionParser by extending this class and overriding the doParse() method to parse any additional
- * attributes or elements it requires. Standard attributes and elements defined by the ResolutionPlugIn and
- * PrincipalConnector schemas will automatically attempt to be parsed.
- */
-public abstract class BasePrincipalConnectrBeanDefinitionParser extends AbstractResolutionPlugInBeanDefinitionParser {
-
-    /** NameID format attribute name. */
-    public static final String NAMEID_FORMAT_ATTRIBUTE_NAME = "nameIDFormat";
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig,
-            java.util.Map<javax.xml.namespace.QName, java.util.List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-
-        pluginBuilder.addPropertyValue("nameIdFormat", pluginConfig.getAttributeNS(null, NAMEID_FORMAT_ATTRIBUTE_NAME));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/CryptoTransientPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/CryptoTransientPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 6edddb8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/CryptoTransientPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition for transient principal connectors.
- */
-public class CryptoTransientPrincipalConnectorBeanDefinitionParser extends BasePrincipalConnectrBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE_URI, "CryptoTransient");
-
-    /** {@inheritDoc} */
-    protected Class<CryptoTransientPrincipalConnectorFactoryBean> getBeanClass(Element arg0) {
-        return CryptoTransientPrincipalConnectorFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        pluginBuilder.addPropertyReference("dataSealer", DatatypeHelper.safeTrimOrNullString(pluginConfig
-                .getAttributeNS(null, "dataSealerRef")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/CryptoTransientPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/CryptoTransientPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index 93a816a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/CryptoTransientPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.CryptoTransientPrincipalConnector;
-import edu.internet2.middleware.shibboleth.common.util.DataSealer;
-
-/**
- * Spring factory bean for {@link CryptoTransientPrincipalConnector}s.
- */
-public class CryptoTransientPrincipalConnectorFactoryBean extends BasePrincipalConnectorFactoryBean {
-
-    /** Object used to decrypt identifiers. */
-    private DataSealer dataSealer;
-
-    /** {@inheritDoc} */
-    public Class<CryptoTransientPrincipalConnector> getObjectType() {
-        return CryptoTransientPrincipalConnector.class;
-    }
-
-    /**
-     * Gets the object used to decrypt identifiers.
-     * 
-     * @return object used to decrypt identifiers
-     */
-    public DataSealer getDataSealer() {
-        return dataSealer;
-    }
-
-    /**
-     * Sets the object used to decrypt identifiers.
-     * 
-     * @param sealer object used to decrypt identifiers
-     */
-    public void setDataSealer(DataSealer sealer) {
-        dataSealer = sealer;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        CryptoTransientPrincipalConnector connector = new CryptoTransientPrincipalConnector(getDataSealer());
-        populatePrincipalConnector(connector);
-
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/DirectPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/DirectPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index c22d031..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/DirectPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * Spring configuration parser for direct principal connectors.
- */
-public class DirectPrincipalConnectorBeanDefinitionParser extends BasePrincipalConnectrBeanDefinitionParser {
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE_URI, "Direct");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return DirectPrincipalConnectorFactoryBean.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/DirectPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/DirectPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index f9ba179..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/DirectPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.DirectPrincipalConnector;
-
-/**
- * Spring factory bean for producing {@link DirectPrincipalConnector}s.
- */
-public class DirectPrincipalConnectorFactoryBean extends BasePrincipalConnectorFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return DirectPrincipalConnector.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        DirectPrincipalConnector connector = new DirectPrincipalConnector();
-        populatePrincipalConnector(connector);
-        
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/PrincipalConnectorNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/PrincipalConnectorNamespaceHandler.java.svn-base
deleted file mode 100644
index e05ba63..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/PrincipalConnectorNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Namespace handler for direct principal connector configuration elements.
- */
-public class PrincipalConnectorNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace URI. */
-    public static final String NAMESPACE_URI = "urn:mace:shibboleth:2.0:resolver:pc";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(DirectPrincipalConnectorBeanDefinitionParser.SCHEMA_TYPE,
-                new DirectPrincipalConnectorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(TransientPrincipalConnectorBeanDefinitionParser.SCHEMA_TYPE,
-                new TransientPrincipalConnectorBeanDefinitionParser());
-
-        registerBeanDefinitionParser(CryptoTransientPrincipalConnectorBeanDefinitionParser.SCHEMA_TYPE,
-                new CryptoTransientPrincipalConnectorBeanDefinitionParser());
-        
-        registerBeanDefinitionParser(StoredIDPrincipalConnectorBeanDefinitionParser.SCHEMA_TYPE,
-                new StoredIDPrincipalConnectorBeanDefinitionParser());
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/StoredIDPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/StoredIDPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 17bdaf8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/StoredIDPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition for transient principal connectors.
- */
-public class StoredIDPrincipalConnectorBeanDefinitionParser extends BasePrincipalConnectrBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE_URI, "StoredId");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return StoredIDPrincipalConnectorFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        pluginBuilder.addPropertyReference("idProducer", DatatypeHelper.safeTrimOrNullString(pluginConfig
-                .getAttributeNS(null, "storedIdDataConnectorRef")));
-
-        boolean noResultsIsError = false;
-        if (pluginConfig.hasAttributeNS(null, "noResultIsError")) {
-            noResultsIsError = XMLHelper.getAttributeValueAsBoolean(pluginConfig.getAttributeNodeNS(null,
-                    "noResultIsError"));
-        }
-        pluginBuilder.addPropertyValue("noResultIsError", noResultsIsError);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/StoredIDPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/StoredIDPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index 58422d9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/StoredIDPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StoredIDDataConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.StoredIDPrincipalConnector;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.TransientPrincipalConnector;
-
-/**
- * Spring factory bean for {@link TransientPrincipalConnector}s.
- */
-public class StoredIDPrincipalConnectorFactoryBean extends BasePrincipalConnectorFactoryBean {
-
-    /** Data connector that produced the ID. */
-    private StoredIDDataConnector idProducer;
-
-    /** Whether an empty result set is an error. */
-    private boolean noResultsIsError;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return StoredIDPrincipalConnector.class;
-    }
-
-    /**
-     * This returns whether this connector will throw an exception if no search results are found. The default is false.
-     * 
-     * @return <code>boolean</code>
-     */
-    public boolean isNoResultIsError() {
-        return noResultsIsError;
-    }
-
-    /**
-     * This sets whether this connector will throw an exception if no search results are found.
-     * 
-     * @param b <code>boolean</code>
-     */
-    public void setNoResultIsError(boolean b) {
-        noResultsIsError = b;
-    }
-
-    /**
-     * Gets the data connector that produced the ID.
-     * 
-     * @return data connector that produced the ID
-     */
-    public StoredIDDataConnector getIdProducer() {
-        return idProducer;
-    }
-
-    /**
-     * Sets the data connector that produced the ID.
-     * 
-     * @param producer data connector that produced the ID
-     */
-    public void setIdProducer(StoredIDDataConnector producer) {
-        idProducer = producer;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        StoredIDPrincipalConnector connector = new StoredIDPrincipalConnector(getIdProducer());
-        populatePrincipalConnector(connector);
-        connector.setNoResultIsError(isNoResultIsError());
-
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/TransientPrincipalConnectorBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/TransientPrincipalConnectorBeanDefinitionParser.java.svn-base
deleted file mode 100644
index fd641b3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/TransientPrincipalConnectorBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition for transient principal connectors.
- */
-public class TransientPrincipalConnectorBeanDefinitionParser extends BasePrincipalConnectrBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE_URI, "Transient");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return TransientPrincipalConnectorFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(String pluginId, Element pluginConfig, Map<QName, List<Element>> pluginConfigChildren,
-            BeanDefinitionBuilder pluginBuilder, ParserContext parserContext) {
-        super.doParse(pluginId, pluginConfig, pluginConfigChildren, pluginBuilder, parserContext);
-
-        pluginBuilder.addPropertyReference("identifierStore", DatatypeHelper.safeTrimOrNullString(pluginConfig
-                .getAttributeNS(null, "storageServiceRef")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/TransientPrincipalConnectorFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/TransientPrincipalConnectorFactoryBean.java.svn-base
deleted file mode 100644
index f76aed4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/principalConnector/.svn/text-base/TransientPrincipalConnectorFactoryBean.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector;
-
-import org.opensaml.util.storage.StorageService;
-
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition.TransientIdEntry;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.principalConnector.TransientPrincipalConnector;
-
-/**
- * Spring factory bean for {@link TransientPrincipalConnector}s.
- */
-public class TransientPrincipalConnectorFactoryBean extends BasePrincipalConnectorFactoryBean {
-
-    /** Store used to map transient identifier tokens to principal names. */
-    private StorageService<String, TransientIdEntry> identifierStore;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return TransientPrincipalConnector.class;
-    }
-
-    /**
-     * Gets the store used to map transient identifier tokens to principal names.
-     * 
-     * @return store used to map transient identifier tokens to principal names
-     */
-    public StorageService<String, TransientIdEntry> getIdentifierStore() {
-        return identifierStore;
-    }
-
-    /**
-     * Sets the store used to map transient identifier tokens to principal names.
-     * 
-     * @param store store used to map transient identifier tokens to principal names
-     */
-    public void setIdentifierStore(StorageService<String, TransientIdEntry> store) {
-        identifierStore = store;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        TransientPrincipalConnector connector = new TransientPrincipalConnector(getIdentifierStore());
-        populatePrincipalConnector(connector);
-
-        return connector;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops
deleted file mode 100644
index 137cb4b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops
+++ /dev/null
@@ -1,95 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 119
-/java-shib-common/!svn/ver/1062/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata
-END
-MetadataFilterChainBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/MetadataFilterChainBeanDefinitionParser.java
-END
-InlineMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/InlineMetadataProviderBeanDefinitionParser.java
-END
-HTTPMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/1062/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPMetadataProviderBeanDefinitionParser.java
-END
-ChainingMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProviderBeanDefinitionParser.java
-END
-ResourceBackedMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/ResourceBackedMetadataProviderBeanDefinitionParser.java
-END
-FilesystemMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 170
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/FilesystemMetadataProviderBeanDefinitionParser.java
-END
-EntityRoleFilterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/EntityRoleFilterBeanDefinitionParser.java
-END
-AbstractReloadingMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/AbstractReloadingMetadataProviderBeanDefinitionParser.java
-END
-MetadataNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/MetadataNamespaceHandler.java
-END
-AbstractMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/AbstractMetadataProviderBeanDefinitionParser.java
-END
-SchemaValidationFilterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/SchemaValidationFilterBeanDefinitionParser.java
-END
-SignatureValidationFilterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/SignatureValidationFilterBeanDefinitionParser.java
-END
-RequiredValidUntilFilterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/RequiredValidUntilFilterBeanDefinitionParser.java
-END
-FileBackedHTTPMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/FileBackedHTTPMetadataProviderBeanDefinitionParser.java
-END
-BaseMetadataProviderBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/BaseMetadataProviderBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries
deleted file mode 100644
index affd080..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries
+++ /dev/null
@@ -1,538 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T23:13:44.670848Z
-1062
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-FileBackedHTTPMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-abfb9bf5aecc2b02d50229b5ba7639a9
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2444
-

-BaseMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-20e3cd1057b01b7cc7993741c2317c42
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4101
-

-MetadataFilterChainBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-617723ffb33d11a9ef9f290c2722d05b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2354
-

-InlineMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-8edfc076ebe46c2643d9f647bb8bdacc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2362
-

-HTTPMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-ec89d23501daf96b138e518989eb06f3
-2013-03-13T23:13:44.670848Z
-1062
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9014
-

-ChainingMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-064e60705f9d3e5801c7b20b29cd2158
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2286
-

-ResourceBackedMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.730777Z
-6ed4d2828ecf2b0a47cea28c3129d82e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2337
-

-FilesystemMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.730777Z
-97e6f62caef7a6f68d303835587bc697
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2343
-

-EntityRoleFilterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-fcb56500e381c6a7eab6dc0b8d73001a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3275
-

-AbstractReloadingMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.726777Z
-67a7349e445f823a5845f28befbcfc60
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7847
-

-MetadataNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:42.730777Z
-5a80511dbe79b987a99440317f9403fc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3108
-

-AbstractMetadataProviderBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.730777Z
-740f337a0d6ad6dd99a1663168b48421
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3442
-

-SchemaValidationFilterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.730777Z
-0a35ff34b3477b21fbe7b286b63665b5
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2390
-

-SignatureValidationFilterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.730777Z
-aaa4daaec08b1bac6818b4056cefb864
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2432
-

-RequiredValidUntilFilterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.730777Z
-a97cd8b403c41fbe455a63cc7de9c73a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2389
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/AbstractMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/AbstractMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/AbstractMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/AbstractReloadingMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/AbstractReloadingMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/AbstractReloadingMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/BaseMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/BaseMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/BaseMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/EntityRoleFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/EntityRoleFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/EntityRoleFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FileBackedHTTPMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FileBackedHTTPMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FileBackedHTTPMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/MetadataFilterChainBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/MetadataFilterChainBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/MetadataFilterChainBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/MetadataNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/MetadataNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/MetadataNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/RequiredValidUntilFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/RequiredValidUntilFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/RequiredValidUntilFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ResourceBackedMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ResourceBackedMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ResourceBackedMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/SchemaValidationFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/SchemaValidationFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/SchemaValidationFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/SignatureValidationFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/SignatureValidationFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/SignatureValidationFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/AbstractMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/AbstractMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 93fd9f6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/AbstractMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Base class for metadata providers that reload their metadata. */
-public abstract class AbstractMetadataProviderBeanDefinitionParser extends BaseMetadataProviderBeanDefinitionParser {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractMetadataProviderBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-        
-        builder.setInitMethodName("initialize");
-
-        String parserPoolRef = getParserPoolRef(config);
-        log.debug("Metadata provider using parser pool: {}", parserPoolRef);
-        builder.addPropertyReference("parserPool", parserPoolRef);
-
-        boolean failFastInit = getFailFastInitialization(config);
-        log.debug("Metadata provider fail fast initialization enabled: {}", failFastInit);
-        builder.addPropertyValue("failFastInitialization", failFastInit);
-    }
-
-    /**
-     * Gets the default parser pool reference for the metadata provider.
-     * 
-     * @param config metadata provider configuration element
-     * 
-     * @return parser pool reference
-     */
-    protected String getParserPoolRef(Element config) {
-        String parserPoolRef = null;
-        if (config.hasAttributeNS(null, "parerPoolRef")) {
-            parserPoolRef = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "parserPoolRef"));
-        }
-
-        if (parserPoolRef == null) {
-            parserPoolRef = "shibboleth.ParserPool";
-        }
-
-        return parserPoolRef;
-    }
-    
-    /**
-     * Gets the fail fast initialization requirement for the metadata provider.
-     * 
-     * @param config metadata provider config
-     * 
-     * @return fail fast initialization requirement for the metadata provider
-     */
-    protected boolean getFailFastInitialization(Element config) {
-        boolean failFastInit = true;
-        if (config.hasAttributeNS(null, "failFastInitialization")) {
-            failFastInit = XMLHelper.getAttributeValueAsBoolean(config.getAttributeNodeNS(null,
-                    "failFastInitialization"));
-        }
-
-        return failFastInit;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/AbstractReloadingMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/AbstractReloadingMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 40bfc09..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/AbstractReloadingMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import javax.xml.datatype.Duration;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Base class for metadata providers that reload their metadata. */
-public abstract class AbstractReloadingMetadataProviderBeanDefinitionParser extends
-        AbstractMetadataProviderBeanDefinitionParser {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractReloadingMetadataProviderBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-
-        String taskTimerRef = getTaskTimerRef(config);
-        log.debug("Metadata provider using task timer: {}", taskTimerRef);
-        builder.addConstructorArgReference(taskTimerRef);
-
-        float refreshDelayFactor = getRefreshDelayFactor(config);
-        log.debug("Metadata provider refresh delay factor: {}", refreshDelayFactor);
-        builder.addPropertyValue("refreshDelayFactor", refreshDelayFactor);
-
-        long minRefreshDelay = getMinRefreshDelay(config);
-        log.debug("Metadata provider min refresh delay: {}ms", minRefreshDelay);
-        builder.addPropertyValue("minRefreshDelay", minRefreshDelay);
-        
-        long maxRefreshDelay = getMaxRefreshDelay(config);
-        log.debug("Metadata provider max refresh delay: {}ms", maxRefreshDelay);
-        builder.addPropertyValue("maxRefreshDelay", maxRefreshDelay);
-    }
-
-    /**
-     * Gets the default parser pool reference for the metadata provider.
-     * 
-     * @param config metadata provider configuration element
-     * 
-     * @return parser pool reference
-     */
-    protected String getParserPoolRef(Element config) {
-        String parserPoolRef = null;
-        if (config.hasAttributeNS(null, "parerPoolRef")) {
-            parserPoolRef = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "parserPoolRef"));
-        }
-
-        if (parserPoolRef == null) {
-            parserPoolRef = "shibboleth.ParserPool";
-        }
-
-        return parserPoolRef;
-    }
-
-    /**
-     * Gets the default task timer reference for the metadata provider.
-     * 
-     * @param config metadata provider configuration element
-     * 
-     * @return task timer reference
-     */
-    protected String getTaskTimerRef(Element config) {
-        String taskTimerRef = null;
-        if (config.hasAttributeNS(null, "taskTimerRef")) {
-            taskTimerRef = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "taskTimerRef"));
-        }
-
-        if (taskTimerRef == null) {
-            taskTimerRef = "shibboleth.TaskTimer";
-        }
-
-        return taskTimerRef;
-    }
-
-    /**
-     * Gets the refresh delay factor for the metadata provider.
-     * 
-     * @param config provider configuration element
-     * 
-     * @return refresh delay factor
-     */
-    protected float getRefreshDelayFactor(Element config) {
-        float delayFactor = 0.75f;
-
-        if (config.hasAttributeNS(null, "refreshDelayFactor")) {
-            String factorString = config.getAttributeNS(null, "refreshDelayFactor");
-            try {
-                delayFactor = Float.parseFloat(factorString);
-            } catch (NumberFormatException e) {
-                log.error("Metadata provider had invalid refreshDelayFactor value '{}', using default value",
-                        factorString);
-            }
-        }
-
-        if (delayFactor <= 0.0 || delayFactor >= 1.0) {
-            log.error("Metadata provider had invalid refreshDelayFactor value '{}', using default value", delayFactor);
-            delayFactor = 0.75f;
-        }
-
-        return delayFactor;
-    }
-
-    /**
-     * Gets the maximum refresh delay for the metadata provider.
-     * 
-     * @param config provider configuration element
-     * 
-     * @return the maximum refresh delay, in milliseconds
-     */
-    protected long getMaxRefreshDelay(Element config) {
-        long maxRefreshDelay = 14400000L;
-
-        if (config.hasAttributeNS(null, "cacheDuration")) {
-            int cacheDuration = Integer.parseInt(config.getAttributeNS(null, "cacheDuration"));
-            maxRefreshDelay = cacheDuration * 1000;
-            log.warn("Metadata provider cacheDuration attribute is deprecated, use maxRefreshDelay=\"{}\" instead.",
-                    XMLHelper.getDataTypeFactory().newDuration(maxRefreshDelay).toString());
-        }
-
-        if (config.hasAttributeNS(null, "maxCacheDuration")) {
-            int cacheDuration = Integer.parseInt(config.getAttributeNS(null, "maxCacheDuration"));
-            Duration duration = XMLHelper.getDataTypeFactory().newDuration(cacheDuration * 1000);
-            log.warn("Metadata provider maxCacheDuration attribute is deprecated, use maxRefreshDelay=\"{}\" instead.",
-                    duration.toString());
-        }
-
-        if (config.hasAttributeNS(null, "maxRefreshDelay")) {
-            String delayString = config.getAttributeNS(null, "maxRefreshDelay");
-            try {
-                maxRefreshDelay = SpringConfigurationUtils.parseDurationToMillis("maxRefreshDelay", delayString, 1);
-            } catch (NumberFormatException e) {
-                log.error("Metadata provider had invalid maxRefreshDelay value '{}', using default value", delayString);
-            }
-        }
-
-        if (maxRefreshDelay <= 0) {
-            log.error("Metadata provider had invalid maxRefreshDelay value '{}', using default value", maxRefreshDelay);
-            maxRefreshDelay = 14400000L;
-        }
-
-        return maxRefreshDelay;
-    }
-
-    /**
-     * Gets the minimum refresh delay for the metadata provider.
-     * 
-     * @param config provider configuration element
-     * 
-     * @return the minimum refresh delay, in milliseconds
-     */
-    protected long getMinRefreshDelay(Element config) {
-        long minRefreshDelay = 300000L;
-
-        if (config.hasAttributeNS(null, "minRefreshDelay")) {
-            String delayString = config.getAttributeNS(null, "minRefreshDelay");
-            try {
-                minRefreshDelay = SpringConfigurationUtils.parseDurationToMillis("minRefreshDelay", delayString, 1);
-            } catch (NumberFormatException e) {
-                log.error("Metadata provider had invalid minRefreshDelay value '{}', using default value", delayString);
-            }
-        }
-
-        if (minRefreshDelay <= 0) {
-            log.error("Metadata provider had invalid minRefreshDelay value '{}', using default value", minRefreshDelay);
-            minRefreshDelay = 300000L;
-        }
-
-        return minRefreshDelay;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/BaseMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/BaseMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 48aeff6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/BaseMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.util.List;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Base class for metadata provider configuration parser. */
-public abstract class BaseMetadataProviderBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseMetadataProviderBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        String id = getProviderId(config);
-        log.debug("Parsing configuration for '{}' metadata provider with ID: {}", XMLHelper.getXSIType(config)
-                .getLocalPart(), id);
-
-        boolean requireValidMetadata = getRequireValidMetadata(config);
-        log.debug("Metadata provider requires valid metadata: {}", requireValidMetadata);
-        builder.addPropertyValue("requireValidMetadata", requireValidMetadata);
-
-        List<Element> childElems = XMLHelper.getChildElementsByTagNameNS(config, MetadataNamespaceHandler.NAMESPACE,
-                "MetadataFilter");
-        if (childElems.size() > 0) {
-            builder.addPropertyValue("metadataFilter", SpringConfigurationUtils.parseInnerCustomElement(
-                    (Element) childElems.get(0), parserContext));
-        }
-    }
-
-    /**
-     * Gets the valid metadata requirement for the metadata provider.
-     * 
-     * @param config metadata provider configuration
-     * 
-     * @return valid metadata requirement for the metadata provider
-     */
-    protected boolean getRequireValidMetadata(Element config) {
-        boolean requireValidMetadata = true;
-
-        if (config.hasAttributeNS(null, "maintainExpiredMetadata")) {
-            boolean maintainedExpiredMetadata = XMLHelper.getAttributeValueAsBoolean(config.getAttributeNodeNS(null,
-                    "maintainExpiredMetadata"));
-            requireValidMetadata = !maintainedExpiredMetadata;
-            log.warn("Use of metadata provider configuration attribute 'maintainExpiredMetadata' is deprecated.  Use requireValidMetadata=\"{}\" instead.",
-                            requireValidMetadata);
-        }
-
-        if (config.hasAttributeNS(null, "requireValidMetadata")) {
-            requireValidMetadata = XMLHelper.getAttributeValueAsBoolean(config.getAttributeNodeNS(null,
-                    "requireValidMetadata"));
-        }
-
-        return requireValidMetadata;
-    }
-
-    /**
-     * Gets the ID of the metadata provider.
-     * 
-     * @param config metadata provider configuration element
-     * 
-     * @return ID of the metadata provider
-     */
-    protected String getProviderId(Element config) {
-        return DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 0738ee9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.ChainingMetadataProvider;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for Shibboleth chaining metadata provider definition.
- */
-public class ChainingMetadataProviderBeanDefinitionParser extends BaseMetadataProviderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "ChainingMetadataProvider");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ChainingMetadataProvider.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-
-        List<Element> providerElems = XMLHelper.getChildElementsByTagNameNS(config, MetadataNamespaceHandler.NAMESPACE,
-                "MetadataProvider");
-        builder.addPropertyValue("providers", SpringConfigurationUtils.parseCustomElements(providerElems, parserContext));
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/EntityRoleFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/EntityRoleFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index e624448..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/EntityRoleFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.EntityRoleFilter;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for {@link EntityRoleFilter}.
- */
-public class EntityRoleFilterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "EntityRoleWhiteList");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return EntityRoleFilter.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        ArrayList<QName> retainedRoles = new ArrayList<QName>();
-        List<Element> retainedRoleElems = XMLHelper.getChildElementsByTagNameNS(element,
-                MetadataNamespaceHandler.NAMESPACE, "RetainedRole");
-        if (retainedRoleElems != null) {
-            for (Element retainedRoleElem : retainedRoleElems) {
-                retainedRoles.add(XMLHelper.getElementContentAsQName(retainedRoleElem));
-            }
-        }
-        builder.addConstructorArgValue(retainedRoles);
-
-        if (element.hasAttributeNS(null, "removeRolelessEntityDescriptors")) {
-            builder.addPropertyValue("removeRolelessEntityDescriptors", XMLHelper.getAttributeValueAsBoolean(element
-                    .getAttributeNodeNS(null, "removeRolelessEntityDescriptors")));
-        }else{
-            builder.addPropertyValue("removeRolelessEntityDescriptors", true);
-        }
-
-        if (element.hasAttributeNS(null, "removeEmptyEntitiesDescriptors")) {
-            builder.addPropertyValue("removeEmptyEntitiesDescriptors", XMLHelper.getAttributeValueAsBoolean(element
-                    .getAttributeNodeNS(null, "removeEmptyEntitiesDescriptors")));
-        }else{
-            builder.addPropertyValue("removeEmptyEntitiesDescriptors", true);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FileBackedHTTPMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FileBackedHTTPMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b284066..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FileBackedHTTPMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.FileBackedHTTPMetadataProvider;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Spring bean definition for Shibboleth file backed metadata provider. */
-public class FileBackedHTTPMetadataProviderBeanDefinitionParser extends HTTPMetadataProviderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE,
-            "FileBackedHTTPMetadataProvider");
-
-    /** Class logger. */
-    private Logger log = LoggerFactory.getLogger(FileBackedHTTPMetadataProviderBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return FileBackedHTTPMetadataProvider.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        String providerId = getProviderId(element);
-        
-        super.doParse(element, parserContext, builder);
-
-        String backingFile = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "backingFile"));
-        log.debug("Metadata provider '{}' backing up remote metadata file to: ", providerId, backingFile);
-        builder.addConstructorArgValue(backingFile);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ebfc4a6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.io.File;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for Shibboleth file system based metadata provider definition.
- */
-public class FilesystemMetadataProviderBeanDefinitionParser extends AbstractReloadingMetadataProviderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "FilesystemMetadataProvider");
-
-    /** Class logger. */
-    private Logger log = LoggerFactory.getLogger(FilesystemMetadataProviderBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return FilesystemMetadataProvider.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-
-        String metadataFile = config.getAttributeNS(null, "metadataFile");
-        log.debug("Metadata provider '{}' reading metadata from: {}", getProviderId(config), metadataFile);
-        builder.addConstructorArgValue(new File(metadataFile));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index e2bb5ff..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.X509TrustManager;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
-import org.opensaml.ws.soap.client.http.HttpClientBuilder;
-import org.opensaml.ws.soap.client.http.TLSProtocolSocketFactory;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for Shibboleth file backed url metadata provider definition.
- */
-public class HTTPMetadataProviderBeanDefinitionParser extends AbstractReloadingMetadataProviderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "HTTPMetadataProvider");
-
-    /** Class logger. */
-    private Logger log = LoggerFactory.getLogger(HTTPMetadataProviderBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return HTTPMetadataProvider.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        String providerId = getProviderId(config);
-
-        super.doParse(config, parserContext, builder);
-
-        String metadataURL = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "metadataURL"));
-        URL metadataURI = null;
-        try {
-            metadataURI = new URL(metadataURL);
-        } catch (MalformedURLException e) {
-            throw new BeanCreationException("metadataURL attribute for metadata provider " + providerId
-                    + " must be present and must contain a valid URL");
-        }
-
-        HttpClient httpClient = buildHttpClient(config, providerId, metadataURI);
-        builder.addConstructorArgValue(httpClient);
-
-        log.debug("Metadata provider '{}' metadata URL: {}", providerId, metadataURL);
-        builder.addConstructorArgValue(metadataURL);
-    }
-
-    /**
-     * Builds the HTTP client used to fetch metadata.
-     * 
-     * @param config the metadata provider configuration element
-     * @param providerId the ID of the metadata provider
-     * @param metadataURL the URL from which metadata will be fetched
-     * 
-     * @return the constructed HTTP client
-     */
-    protected HttpClient buildHttpClient(Element config, String providerId, URL metadataURL) {
-        HttpClientBuilder builder = new HttpClientBuilder();
-
-        int requestTimeout = 5000;
-        if (config.hasAttributeNS(null, "requestTimeout")) {
-            requestTimeout = (int) SpringConfigurationUtils.parseDurationToMillis(
-                    "'requestTimeout' on metadata provider " + providerId,
-                    config.getAttributeNS(null, "requestTimeout"), 0);
-        }
-        log.debug("Metadata provider '{}' HTTP request timeout: {}ms", providerId, requestTimeout);
-        builder.setConnectionTimeout(requestTimeout);
-
-        if (metadataURL.getProtocol().equalsIgnoreCase("https")) {
-            boolean disregardSslCertificate = false;
-            if (config.hasAttributeNS(null, "disregardSslCertificate")) {
-                disregardSslCertificate = XMLHelper.getAttributeValueAsBoolean(config.getAttributeNodeNS(null,
-                        "disregardSslCertificate"));
-            }
-
-            log.debug("Metadata provider '{}' disregards server SSL certificate: {}", providerId,
-                    disregardSslCertificate);
-            if (disregardSslCertificate) {
-                builder.setHttpsProtocolSocketFactory(new TLSProtocolSocketFactory(null, buildNoTrustTrustManager()));
-            } else {
-                builder.setHttpsProtocolSocketFactory(new TLSProtocolSocketFactory(null, null, 
-                        org.apache.commons.ssl.HostnameVerifier.STRICT));
-            }
-        }
-
-        setHttpProxySettings(builder, config, providerId);
-
-        HttpClient httpClient = builder.buildClient();
-        setHttpBasicAuthSettings(httpClient, config, providerId, metadataURL);
-
-        return httpClient;
-    }
-
-    /**
-     * Builds a {@link X509TrustManager} which bypasses all X.509 validation steps.
-     * 
-     * @return the trustless trust manager
-     */
-    protected X509TrustManager buildNoTrustTrustManager() {
-        X509TrustManager noTrustManager = new X509TrustManager() {
-
-            /** {@inheritDoc} */
-            public void checkClientTrusted(X509Certificate[] certs, String auth) {
-            }
-
-            /** {@inheritDoc} */
-            public void checkServerTrusted(X509Certificate[] certs, String auth) {
-            }
-
-            /** {@inheritDoc} */
-            public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[] {};
-            }
-        };
-
-        return noTrustManager;
-    }
-
-    /**
-     * Sets the HTTP proxy properties, if any, for the HTTP client used to fetch metadata.
-     * 
-     * @param builder the HTTP client builder
-     * @param config the metadata provider configuration
-     * @param providerId the ID of the metadata provider
-     */
-    protected void setHttpProxySettings(HttpClientBuilder builder, Element config, String providerId) {
-        String proxyHost = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "proxyHost"));
-        if (proxyHost == null) {
-            return;
-        }
-        log.debug("Metadata provider '{}' HTTP proxy host: {}", providerId, proxyHost);
-        builder.setProxyHost(proxyHost);
-
-        if (config.hasAttributeNS(null, "proxyPort")) {
-            int proxyPort = Integer.parseInt(config.getAttributeNS(null, "proxyPort"));
-            log.debug("Metadata provider '{}' HTTP proxy port: ", providerId, proxyPort);
-            builder.setProxyPort(proxyPort);
-        }
-
-        String proxyUser = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "proxyUser"));
-        if (proxyUser != null) {
-            log.debug("Metadata provider '{}' HTTP proxy username: ", providerId, proxyUser);
-            builder.setProxyUsername(proxyUser);
-            log.debug("Metadata provider '{}' HTTP proxy password not shown", providerId);
-            builder.setProxyPassword(DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "proxyPassword")));
-        }
-    }
-
-    /**
-     * Sets the basic authentication properties, if any, for the HTTP client used to fetch metadata.
-     * 
-     * @param httpClient the HTTP client
-     * @param config the metadata provider configuration
-     * @param providerId the ID of the metadata provider
-     * @param metadataURL the URL from which metadata will be fetched
-     */
-    protected void setHttpBasicAuthSettings(HttpClient httpClient, Element config, String providerId, URL metadataURL) {
-        String authUser = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "basicAuthUser"));
-        if (authUser == null) {
-            return;
-        }
-        log.debug("Metadata provider '{}' HTTP Basic Auth username: {}", providerId, authUser);
-
-        String authPassword = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "basicAuthPassword"));
-        log.debug("Metadata provider '{}' HTTP Basic Auth password not show", providerId);
-
-        UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(authUser, authPassword);
-        AuthScope authScope = new AuthScope(metadataURL.getHost(), metadataURL.getPort());
-        httpClient.getState().setCredentials(authScope, credentials);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 15fb5ce..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.common.xml.SAMLConstants;
-import org.opensaml.saml2.metadata.provider.DOMMetadataProvider;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for a OpenSAML2 DOMMetadataProvider.
- */
-public class InlineMetadataProviderBeanDefinitionParser extends AbstractMetadataProviderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "InlineMetadataProvider");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return DOMMetadataProvider.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-
-        List<Element> metadataContent = XMLHelper.getChildElementsByTagNameNS(config, SAMLConstants.SAML20MD_NS,
-                "EntitiesDescriptor");
-        if (metadataContent.size() < 1) {
-            metadataContent = XMLHelper.getChildElementsByTagNameNS(config, SAMLConstants.SAML20MD_NS,
-                    "EntityDescriptor");
-        }
-        builder.addConstructorArgValue((Element) metadataContent.get(0));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/MetadataFilterChainBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/MetadataFilterChainBeanDefinitionParser.java.svn-base
deleted file mode 100644
index cef40dc..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/MetadataFilterChainBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.MetadataFilterChain;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for {@link MetadataFilterChain}s.
- */
-public class MetadataFilterChainBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "ChainingFilter");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MetadataFilterChain.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        List<Element> filterElems = XMLHelper.getChildElementsByTagNameNS(element, MetadataNamespaceHandler.NAMESPACE,
-                "MetadataFilter");
-        builder.addPropertyValue("filters", SpringConfigurationUtils.parseInnerCustomElements(filterElems, parserContext));
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/MetadataNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/MetadataNamespaceHandler.java.svn-base
deleted file mode 100644
index 86cca7e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/MetadataNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for the Shibboleth metadata namespace.
- */
-public class MetadataNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:metadata";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(ChainingMetadataProviderBeanDefinitionParser.TYPE_NAME,
-                new ChainingMetadataProviderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(ResourceBackedMetadataProviderBeanDefinitionParser.TYPE_NAME,
-                new ResourceBackedMetadataProviderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(InlineMetadataProviderBeanDefinitionParser.TYPE_NAME,
-                new InlineMetadataProviderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(FileBackedHTTPMetadataProviderBeanDefinitionParser.TYPE_NAME,
-                new FileBackedHTTPMetadataProviderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(HTTPMetadataProviderBeanDefinitionParser.TYPE_NAME,
-                new HTTPMetadataProviderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(FilesystemMetadataProviderBeanDefinitionParser.TYPE_NAME,
-                new FilesystemMetadataProviderBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MetadataFilterChainBeanDefinitionParser.TYPE_NAME,
-                new MetadataFilterChainBeanDefinitionParser());
-
-        registerBeanDefinitionParser(RequiredValidUntilFilterBeanDefinitionParser.TYPE_NAME,
-                new RequiredValidUntilFilterBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SchemaValidationFilterBeanDefinitionParser.TYPE_NAME,
-                new SchemaValidationFilterBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SignatureValidationFilterBeanDefinitionParser.TYPE_NAME,
-                new SignatureValidationFilterBeanDefinitionParser());
-
-        registerBeanDefinitionParser(EntityRoleFilterBeanDefinitionParser.TYPE_NAME,
-                new EntityRoleFilterBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/RequiredValidUntilFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/RequiredValidUntilFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 0c53e5e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/RequiredValidUntilFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.RequiredValidUntilFilter;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Bean definition parser for {@link RequiredValidUntilFilter} beans. */
-public class RequiredValidUntilFilterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "RequiredValidUntil");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return RequiredValidUntilFilter.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        if (element.hasAttributeNS(null, "maxValidityInterval")) {
-            long interval = SpringConfigurationUtils.parseDurationToMillis(
-                    "'maxValidityInterval' on metadata filter of type " + XMLHelper.getXSIType(element), element
-                            .getAttributeNS(null, "maxValidityInterval"), 1000) / 1000;
-            builder.addConstructorArgValue(interval);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ResourceBackedMetadataProviderBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ResourceBackedMetadataProviderBeanDefinitionParser.java.svn-base
deleted file mode 100644
index da787ff..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ResourceBackedMetadataProviderBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.ResourceBackedMetadataProvider;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Parser for {@link ResourceBackedMetadataProvider} definitions. */
-public class ResourceBackedMetadataProviderBeanDefinitionParser extends
-        AbstractReloadingMetadataProviderBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE,
-            "ResourceBackedMetadataProvider");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ResourceBackedMetadataProvider.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(config, parserContext, builder);
-
-        List<Element> resourceElems = XMLHelper.getChildElementsByTagNameNS(config, MetadataNamespaceHandler.NAMESPACE,
-                "MetadataResource");
-        builder.addConstructorArgValue(SpringConfigurationUtils.parseInnerCustomElement(resourceElems.get(0),
-                parserContext));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/SchemaValidationFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/SchemaValidationFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index fa9df88..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/SchemaValidationFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.SchemaValidationFilter;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * Bean definition parser for {@link SchemaValidationFilter} beans.
- */
-public class SchemaValidationFilterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "SchemaValidation");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SchemaValidationFilter.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        String[] extensions = null;
-        
-        List<Element> elems = XMLHelper.getChildElementsByTagNameNS(element, MetadataNamespaceHandler.NAMESPACE,
-                "ExtensionSchema");
-        if (elems != null) {
-            extensions = new String[elems.size()];
-            for (int i = 0; i < elems.size(); i++) {
-                extensions[i] = elems.get(i).getTextContent();
-            }
-        }
-        
-        builder.addConstructorArgValue(extensions);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/SignatureValidationFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/SignatureValidationFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b6dfa9c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/SignatureValidationFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.metadata.provider.SignatureValidationFilter;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * Bean definition parser for {@link SignatureValidationFilter} beans.
- */
-public class SignatureValidationFilterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(MetadataNamespaceHandler.NAMESPACE, "SignatureValidation");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SignatureValidationFilter.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgReference(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "trustEngineRef")));
-
-        if (element.hasAttributeNS(null, "requireSignedMetadata")) {
-            builder.addPropertyValue("requireSignature", XMLHelper.getAttributeValueAsBoolean(element
-                    .getAttributeNodeNS(null, "requireSignedMetadata")));
-        }else{
-            builder.addPropertyValue("requireSignature", false);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/all-wcprops
deleted file mode 100644
index d64dece..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 118
-/java-shib-common/!svn/ver/1054/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile
-END
-AbstractShibbolethProfileHandlerBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 175
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/AbstractShibbolethProfileHandlerBeanDefinitionParser.java
-END
-VelocityErrorHandlerBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/VelocityErrorHandlerBeanDefinitionParser.java
-END
-AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/1054/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java
-END
-JSPErrorHandlerBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/JSPErrorHandlerBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/entries
deleted file mode 100644
index 8cac849..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/entries
+++ /dev/null
@@ -1,164 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-02-14T04:33:36.945796Z
-1054
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.766778Z
-b0e3baadee3dbe2e326d17409b433ead
-2013-02-14T04:33:36.945796Z
-1054
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2783
-

-JSPErrorHandlerBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.766778Z
-cb03756d5254260a2ca13bfcc3e90426
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2307
-

-AbstractShibbolethProfileHandlerBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.766778Z
-8d3ba0c2be6e559838ce73ba5b09ab85
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1856
-

-VelocityErrorHandlerBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.766778Z
-ca81eab9e8f92cc4af316c28813dace9
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2464
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/AbstractShibbolethProfileHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/AbstractShibbolethProfileHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/AbstractShibbolethProfileHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/JSPErrorHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/JSPErrorHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/JSPErrorHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/VelocityErrorHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/VelocityErrorHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/prop-base/VelocityErrorHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 54dfe5b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.profile;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * Base class for request URI mapped profile handler configuration parsers.
- */
-public abstract class AbstractRequestURIMappedProfileHandlerBeanDefinitionParser extends
-        AbstractSingleBeanDefinitionParser {
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory
-            .getLogger(AbstractRequestURIMappedProfileHandlerBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for profile handler: {}", XMLHelper.getXSIType(config).getLocalPart());
-
-        builder.addPropertyValue("requestPaths", getRequestPaths(config));
-    }
-
-    /**
-     * Gets the list of request paths the profile handler handles.
-     * 
-     * @param config profile handler configuration element
-     * 
-     * @return list of request paths the profile handler handles
-     */
-    protected List<String> getRequestPaths(Element config) {
-        ArrayList<String> requestPaths = new ArrayList<String>();
-        List<Element> requestPathElems = XMLHelper.getChildElementsByTagName(config, "RequestPath");
-        if (requestPathElems != null) {
-            for (Element requestPathElem : requestPathElems) {
-                requestPaths.add(DatatypeHelper.safeTrimOrNullString(requestPathElem.getTextContent()));
-            }
-        }
-
-        return requestPaths;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/AbstractShibbolethProfileHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/AbstractShibbolethProfileHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index cda59a6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/AbstractShibbolethProfileHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.profile;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
-/** Base class for request bound profile handler configuration parsers. */
-public abstract class AbstractShibbolethProfileHandlerBeanDefinitionParser extends
-        AbstractRequestURIMappedProfileHandlerBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, BeanDefinitionBuilder builder) {
-        super.doParse(config, builder);
-
-        builder.addPropertyReference("parserPool", config.getAttributeNS(null, "parserPoolRef"));
-        
-        builder.addPropertyReference("storageService", config.getAttributeNS(null, "storageServiceRef"));
-
-        builder.addPropertyReference("relyingPartyConfigurationManager", config.getAttributeNS(null,
-                "relyingPartyManagerId"));
-
-        builder.addPropertyReference("sessionManager", config.getAttributeNS(null, "sessionManagerId"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/JSPErrorHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/JSPErrorHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 88dfb5a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/JSPErrorHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.profile;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.profile.provider.JSPErrorHandler;
-
-/**
- * Spring bean definition parser for {@link JSPErrorHandler}s.
- */
-public class JSPErrorHandlerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Element name. */
-    public static final String ELEMENT_NAME = "JSPErrorHandler";
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(JSPErrorHandlerBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return JSPErrorHandler.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for JSP error handler.");
-        super.doParse(config, builder);
-
-        if(config.hasAttributeNS(null, "jspPagePath")){
-            builder.addConstructorArgValue(config.getAttributeNS(null, "jspPagePath"));
-        }else{
-            builder.addConstructorArgValue(config.getAttributeNS(null, "/error.jsp"));
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/VelocityErrorHandlerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/VelocityErrorHandlerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d6131de..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/profile/.svn/text-base/VelocityErrorHandlerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.profile;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.profile.provider.VelocityErrorHandler;
-
-/**
- * Spring bean definition parser for {@link VelocityErrorHandler}s.
- */
-public class VelocityErrorHandlerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Element name. */
-    public static final String ELEMENT_NAME = "VelocityErrorHandler";
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(VelocityErrorHandlerBeanDefinitionParser.class);
-    
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return VelocityErrorHandler.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for velocity error handler.");
-        super.doParse(config, builder);        
-
-        builder.addConstructorArgReference(config.getAttributeNS(null, "velocityEngine"));
-        
-        if(config.hasAttributeNS(null, "errorTemplatePath")){
-            builder.addConstructorArgValue(config.getAttributeNS(null, "errorTemplatePath"));
-        }else{
-            builder.addConstructorArgValue(config.getAttributeNS(null, "/error.vm"));
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops
deleted file mode 100644
index 46ba803..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/1060/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty
-END
-RelyingPartyGroupBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/RelyingPartyGroupBeanDefinitionParser.java
-END
-RelyingPartyNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/RelyingPartyNamespaceHandler.java
-END
-RelyingPartyGroup.java
-K 25
-svn:wc:ra_dav:version-url
-V 145
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/RelyingPartyGroup.java
-END
-SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java
-END
-RelyingPartyFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/RelyingPartyFactoryBean.java
-END
-RelyingPartyConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 173
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/RelyingPartyConfigurationBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries
deleted file mode 100644
index 1ee57c1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries
+++ /dev/null
@@ -1,235 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-08T19:26:10.353043Z
-1060
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-saml
-dir
-

-RelyingPartyConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.214826Z
-b1f54338522c7c99ff4f41f49d87ee37
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6075
-

-RelyingPartyGroupBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.214826Z
-f1316afb0b0f7bad79085f4a903a6464
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5469
-

-RelyingPartyNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:45.214826Z
-c795db4808ca2ec8ded969e0960b6655
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2191
-

-RelyingPartyGroup.java
-file
-
-
-
-
-2014-02-19T17:27:45.214826Z
-f83ab7b4be4f808b6768a19c37ad8100
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5271
-

-SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.214826Z
-e9ec07e0241c60d370477823d4a6eecd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1763
-

-RelyingPartyFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.214826Z
-6ceca963ec5d7c9e554c46f27bd371f0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6215
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyGroup.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyGroup.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyGroup.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyGroupBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyGroupBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyGroupBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/RelyingPartyNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index e01496d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.SAMLMDRelyingPartyConfigurationManager;
-
-/**
- * Bean definition parser for relying party elements.
- */
-public class RelyingPartyConfigurationBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName URP_TYPE_NAME = new QName(RelyingPartyNamespaceHandler.NAMESPACE,
-            "UnidentifiedRelyingParty");
-
-    /** Schema type name. */
-    public static final QName RP_TYPE_NAME = new QName(RelyingPartyNamespaceHandler.NAMESPACE, 
-            "IdentifiedRelyingParty");
-
-    /** Name of the anonymous relying party configuration element. */
-    public static final QName ANON_RP_ELEMENT_NAME = new QName(RelyingPartyNamespaceHandler.NAMESPACE,
-            "AnonymousRelyingParty");
-
-    /** Name of the default relying party configuration element. */
-    public static final QName DEFAULT_RP_ELEMENT_NAME = new QName(RelyingPartyNamespaceHandler.NAMESPACE,
-            "DefaultRelyingParty");
-
-    /** Name of the relying party configuration element. */
-    public static final QName RP_ELEMENT_NAME = new QName(RelyingPartyNamespaceHandler.NAMESPACE, "RelyingParty");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(RelyingPartyConfigurationBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return RelyingPartyFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        String rpId = getRelyingPartyId(config);
-        log.info("Parsing configuration for relying party with id: {}", rpId);
-        builder.addPropertyValue("relyingPartyId", rpId);
-
-        String provider = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "provider"));
-        log.debug("Relying party configuration - provider ID: {}", provider);
-        builder.addPropertyValue("providerId", provider);
-
-        String authnMethod = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null,
-                "defaultAuthenticationMethod"));
-        log.debug("Relying party configuration - default authentication method: {}", authnMethod);
-        builder.addPropertyValue("defaultAuthenticationMethod", authnMethod);
-
-        String secCredRef = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null,
-                "defaultSigningCredentialRef"));
-        if (secCredRef != null) {
-            log.debug("Relying party configuration - default signing credential: {}", secCredRef);
-            builder.addPropertyReference("defaultSigningCredential", secCredRef);
-        }
-
-        Attr precedenceAttr = config.getAttributeNodeNS(null, "nameIDFormatPrecedence");
-        if(precedenceAttr != null){
-            List<String> precedence = XMLHelper.getAttributeValueAsList(precedenceAttr);
-            log.debug("Relying party configuration - NameID format precedence: {}", precedence);
-            builder.addPropertyValue("nameIdFormatPrecedence", precedence);
-        }
-        
-        List<Element> profileConfigs = XMLHelper.getChildElementsByTagNameNS(config,
-                RelyingPartyNamespaceHandler.NAMESPACE, "ProfileConfiguration");
-        if (profileConfigs != null && profileConfigs.size() > 0) {
-            log.debug("Relying party configuration - {} profile configurations", profileConfigs.size());
-            builder.addPropertyValue("profileConfigurations", SpringConfigurationUtils.parseInnerCustomElements(
-                    profileConfigs, parserContext));
-        }
-    }
-
-    /**
-     * Gets the ID of the relying party.
-     * 
-     * @param config relying party configuration element
-     * 
-     * @return ID of the relying party
-     */
-    protected String getRelyingPartyId(Element config) {
-        String id = DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "id"));
-        if (id == null) {
-            if (XMLHelper.getNodeQName(config).equals(ANON_RP_ELEMENT_NAME)) {
-                id = SAMLMDRelyingPartyConfigurationManager.ANONYMOUS_RP_NAME;
-            } else if (XMLHelper.getNodeQName(config).equals(DEFAULT_RP_ELEMENT_NAME)) {
-                id = SAMLMDRelyingPartyConfigurationManager.DEFAULT_RP_NAME;
-            }
-        }
-
-        return id;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element arg0, AbstractBeanDefinition arg1, ParserContext arg2) {
-        return getRelyingPartyId(arg0);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyFactoryBean.java.svn-base
deleted file mode 100644
index 6d3b06a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyFactoryBean.java.svn-base
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty;
-
-import java.util.List;
-import java.util.Map;
-
-import org.opensaml.xml.security.credential.Credential;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-
-/**
- * Relying party configuration factory bean.
- */
-public class RelyingPartyFactoryBean extends AbstractFactoryBean {
-    
-    /** ID of the relying party. */
-    private String relyingPartyId;
-
-    /** ID of the provider to use for this relying party. */
-    private String providerId;
-    
-    /** Authentication method to use if none is specified within a request. */
-    private String defaultAuthenticationMethod;
-
-    /** The default signing credential for this relying party. */
-    private Credential defaultSigningCredential;
-
-    /** Precedence ordering of NameID formats for this relying party. */
-    private List<String> nameIdFormatPrecedence;
-    
-    /** Registered profile configurations. */
-    private List<ProfileConfiguration> profileConfigurations;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return RelyingPartyConfiguration.class;
-    }
-    
-    /**
-     * Gets the ID of the relying party.
-     * 
-     * @return ID of the provider to use for this relying party
-     */
-    public String getRelyingPartyId() {
-        return relyingPartyId;
-    }
-
-    /**
-     * Sets the ID of the relying party.
-     * 
-     * @param id ID of the relying party
-     */
-    public void setRelyingPartyId(String id) {
-        relyingPartyId = id;
-    }
-
-    /**
-     * Gets the ID of the provider to use for this relying party.
-     * 
-     * @return ID of the provider to use for this relying party
-     */
-    public String getProviderId() {
-        return providerId;
-    }
-
-    /**
-     * Sets the ID of the provider to use for this relying party.
-     * 
-     * @param id ID of the provider to use for this relying party
-     */
-    public void setProviderId(String id) {
-        providerId = id;
-    }
-    
-    /**
-     * Gets the authentication method to use if one is not specified within a request.
-     * 
-     * @return authentication method to use if one is not specified within a request
-     */
-    public String getDefaultAuthenticationMethod() {
-        return defaultAuthenticationMethod;
-    }
-
-    /**
-     * Sets the authentication method to use if one is not specified within a request.
-     * 
-     * @param method authentication method to use if one is not specified within a request
-     */
-    public void setDefaultAuthenticationMethod(String method) {
-        defaultAuthenticationMethod = method;
-    }
-
-    /**
-     * Gets the default signing credential for this relying party.
-     * 
-     * @return default signing credential for this relying party
-     */
-    public Credential getDefaultSigningCredential() {
-        return defaultSigningCredential;
-    }
-
-    /**
-     * Sets the default signing credential for this relying party.
-     * 
-     * @param credential default signing credential for this relying party
-     */
-    public void setDefaultSigningCredential(Credential credential) {
-        defaultSigningCredential = credential;
-    }
-    
-    /**
-     * Gets the precedence of NameID formats for this relying party.
-     * 
-     * @return precedence of NameID formats for this relying party
-     */
-    public List<String> getNameIdFormatPrecedence() {
-        return nameIdFormatPrecedence;
-    }
-
-    /**
-     * Sets the precedence of NameID formats for this relying party.
-     * 
-     * @param precedence precedence of NameID formats for this relying party
-     */
-    public void setNameIdFormatPrecedence(List<String> precedence) {
-        nameIdFormatPrecedence = precedence;
-    }
-
-    /**
-     * Gets the registered profile configurations.
-     * 
-     * @return registered profile configurations
-     */
-    public List<ProfileConfiguration> getProfileConfigurations() {
-        return profileConfigurations;
-    }
-
-    /**
-     * Sets the registered profile configurations.
-     * 
-     * @param configurations registered profile configurations
-     */
-    public void setProfileConfigurations(List<ProfileConfiguration> configurations) {
-        profileConfigurations = configurations;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        RelyingPartyConfiguration configuration = new RelyingPartyConfiguration(relyingPartyId, providerId);
-        configuration.setDefaultAuthenticationMethod(defaultAuthenticationMethod);
-        configuration.setDefaultSigningCredential(defaultSigningCredential);
-        if(nameIdFormatPrecedence != null && !nameIdFormatPrecedence.isEmpty()){
-            configuration.setNameIdFormatPrecedence(nameIdFormatPrecedence.toArray(new String[nameIdFormatPrecedence.size()]));
-        }
-
-        if (profileConfigurations != null) {
-            Map<String, ProfileConfiguration> registeredProfileConfigs = configuration.getProfileConfigurations();
-            for (ProfileConfiguration profileConfig : profileConfigurations) {
-                registeredProfileConfigs.put(profileConfig.getProfileId(), profileConfig);
-            }
-        }
-
-        return configuration;
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyGroup.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyGroup.java.svn-base
deleted file mode 100644
index cbe5e2a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyGroup.java.svn-base
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty;
-
-import java.util.List;
-
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.ws.security.SecurityPolicy;
-import org.opensaml.xml.security.credential.Credential;
-import org.opensaml.xml.security.trust.TrustEngine;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-
-/**
- * Container for relying party group information.
- */
-public class RelyingPartyGroup {
-
-    /** Anonymous relying party config for the group. */
-    private RelyingPartyConfiguration anonymousRP;
-
-    /** Default relying party config for the group. */
-    private RelyingPartyConfiguration defaultRP;
-
-    /** Relying party config for the group. */
-    private List<RelyingPartyConfiguration> relyingParties;
-
-    /** Metadata provider for the group. */
-    private MetadataProvider metadataProvider;
-    
-    /** Security policies for the group. */
-    private List<SecurityPolicy> securityPolicies;
-    
-    /** Trust engines for the group. */
-    private List<TrustEngine> trustEngines;
-
-    /** Credentials for the group. */
-    private List<Credential> groupCredentials;
-    
-    /**
-     * Gets the anonymous relying party config for the group.
-     * 
-     * @return anonymous relying party config for the group
-     */
-    public RelyingPartyConfiguration getAnonymousRP() {
-        return anonymousRP;
-    }
-    
-    /**
-     * Gets the credentials for the group.
-     * 
-     * @return credentials for the group
-     */
-    public List<Credential> getCredentials() {
-        return groupCredentials;
-    }
-    
-    /**
-     * Gets the default relying party for the group.
-     * 
-     * @return default relying party for the group
-     */
-    public RelyingPartyConfiguration getDefaultRP() {
-        return defaultRP;
-    }
-    
-    /**
-     * Gets the metadata provider for the group.
-     * 
-     * @return metadata provider for the group
-     */
-    public MetadataProvider getMetadataProvider() {
-        return metadataProvider;
-    }
-
-    /**
-     * Gets the relying party configurations for the group.
-     * 
-     * @return relying party configurations for the group
-     */
-    public List<RelyingPartyConfiguration> getRelyingParties() {
-        return relyingParties;
-    }
-
-    /**
-     * Gets the security policies for the group.
-     * 
-     * @return security policies for the group
-     */
-    public List<SecurityPolicy> getSecurityPolicies() {
-        return securityPolicies;
-    }
-
-    /**
-     * Gets the trust engines for the group.
-     * 
-     * @return trust engines for the group
-     */
-    public List<TrustEngine> getTrustEngines() {
-        return trustEngines;
-    }
-
-    /**
-     * Sets the anonymous relying party config for the group.
-     * 
-     * @param config anonymous relying party config for the group
-     */
-    public void setAnonymousRP(RelyingPartyConfiguration config) {
-        anonymousRP = config;
-    }
-
-    /**
-     * Sets the credentials for the group.
-     * 
-     * @param credentials credentials for the group
-     */
-    public void setCredentials(List<Credential> credentials) {
-        groupCredentials = credentials;
-    }
-
-    /**
-     * Sets the default relying party for the group.
-     * 
-     * @param config default relying party for the group
-     */
-    public void setDefaultRP(RelyingPartyConfiguration config) {
-        defaultRP = config;
-    }
-
-    /**
-     * Sets the metadata provider for the group.
-     * 
-     * @param provider metadata provider for the group
-     */
-    public void setMetadataProvider(MetadataProvider provider) {
-        metadataProvider = provider;
-    }
-
-    /**
-     * Sets the relying party configurations for the group.
-     * 
-     * @param configurations relying party configurations for the group
-     */
-    public void setRelyingParties(List<RelyingPartyConfiguration> configurations) {
-        relyingParties = configurations;
-    }
-
-    /**
-     * Sets the security policies for the group.
-     * 
-     * @param policies security policies for the group
-     */
-    public void setSecurityPolicies(List<SecurityPolicy> policies) {
-        securityPolicies = policies;
-    }
-
-    /**
-     * Sets the trust engines for the group.
-     * 
-     * @param engines trust engines for the group
-     */
-    public void setTrustEngines(List<TrustEngine> engines) {
-        trustEngines = engines;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyGroupBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyGroupBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 5be69ba..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyGroupBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.config.metadata.MetadataNamespaceHandler;
-import edu.internet2.middleware.shibboleth.common.config.security.SecurityNamespaceHandler;
-
-/**
- * Spring bean definition parser for relying party group configurations.
- */
-public class RelyingPartyGroupBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Element name. */
-    public static final QName ELEMENT_NAME = new QName(RelyingPartyNamespaceHandler.NAMESPACE, "RelyingPartyGroup");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return RelyingPartyGroup.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element config, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(config);
-
-        List<Element> mds = configChildren.get(new QName(MetadataNamespaceHandler.NAMESPACE, "MetadataProvider"));
-        if (mds != null && mds.size() > 0) {
-            Element mdConfigElem = mds.get(0);
-            SpringConfigurationUtils.parseCustomElement(mdConfigElem, parserContext);
-            builder.addPropertyValue("metadataProvider", new RuntimeBeanReference(mdConfigElem.getAttributeNS(null,
-                    "id")));
-        }
-
-        parseRelyingPartyConfiguration(configChildren, builder, parserContext);
-
-        parseSecurityConfiguration(configChildren, builder, parserContext);
-    }
-
-    /**
-     * Parses the relying party related configuration elements.
-     * 
-     * @param configChildren relying party group children
-     * @param builder bean definition builder
-     * @param parserContext current parsing context
-     */
-    protected void parseRelyingPartyConfiguration(Map<QName, List<Element>> configChildren,
-            BeanDefinitionBuilder builder, ParserContext parserContext) {
-        List<Element> anonRP = configChildren.get(RelyingPartyConfigurationBeanDefinitionParser.ANON_RP_ELEMENT_NAME);
-        if (anonRP != null && anonRP.size() > 0) {
-            builder.addPropertyValue("anonymousRP", SpringConfigurationUtils.parseInnerCustomElement(anonRP.get(0),
-                    parserContext));
-        }
-
-        List<Element> defaultRP = configChildren
-                .get(RelyingPartyConfigurationBeanDefinitionParser.DEFAULT_RP_ELEMENT_NAME);
-        builder.addPropertyValue("defaultRP", SpringConfigurationUtils.parseInnerCustomElement(defaultRP.get(0),
-                parserContext));
-
-        List<Element> rps = configChildren.get(RelyingPartyConfigurationBeanDefinitionParser.RP_ELEMENT_NAME);
-        builder.addPropertyValue("relyingParties", SpringConfigurationUtils
-                .parseInnerCustomElements(rps, parserContext));
-    }
-
-    /**
-     * Parses the security related configuration elements.
-     * 
-     * @param configChildren relying party group children
-     * @param builder bean definition builder
-     * @param parserContext current parsing context
-     */
-    protected void parseSecurityConfiguration(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder,
-            ParserContext parserContext) {
-
-        List<Element> creds = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "Credential"));
-        builder.addPropertyValue("credentials", SpringConfigurationUtils
-                        .parseInnerCustomElements(creds, parserContext));
-
-        List<Element> engines = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "TrustEngine"));
-        builder.addPropertyValue("trustEngines", SpringConfigurationUtils.parseInnerCustomElements(engines,
-                parserContext));
-
-        List<Element> secPols = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "SecurityPolicy"));
-        builder.addPropertyValue("securityPolicies", SpringConfigurationUtils.parseInnerCustomElements(secPols,
-                parserContext));
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyNamespaceHandler.java.svn-base
deleted file mode 100644
index 7444e56..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/RelyingPartyNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty;
-
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for the Shibboleth relying party namespace.
- */
-public class RelyingPartyNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:relying-party";
-
-    /** {@inheritDoc} */
-    public void init() {
-
-        registerBeanDefinitionParser(RelyingPartyGroupBeanDefinitionParser.ELEMENT_NAME,
-                new RelyingPartyGroupBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.SCHEMA_TYPE,
-                new SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser());
-
-        BeanDefinitionParser parser = new RelyingPartyConfigurationBeanDefinitionParser();
-        registerBeanDefinitionParser(RelyingPartyConfigurationBeanDefinitionParser.ANON_RP_ELEMENT_NAME, parser);
-        registerBeanDefinitionParser(RelyingPartyConfigurationBeanDefinitionParser.DEFAULT_RP_ELEMENT_NAME, parser);
-        registerBeanDefinitionParser(RelyingPartyConfigurationBeanDefinitionParser.RP_ELEMENT_NAME, parser);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 94fd545..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.service.AbstractReloadableServiceBeanDefinitionParser;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.SAMLMDRelyingPartyConfigurationManager;
-
-/**
- * Spring bean definition parser for {@link SAMLMDRelyingPartyConfigurationManager} services.
- */
-public class SAMLMDRelyingPartyConfigurationManagerBeanDefinitionParser extends
-        AbstractReloadableServiceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(RelyingPartyNamespaceHandler.NAMESPACE,
-            "SAMLMDRelyingPartyConfigurationManager");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return SAMLMDRelyingPartyConfigurationManager.class;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/all-wcprops
deleted file mode 100644
index e9fd6d2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/all-wcprops
+++ /dev/null
@@ -1,143 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 128
-/java-shib-common/!svn/ver/1060/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml
-END
-AbstractSAML1ProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAML1ProfileConfigurationBeanDefinitionParser.java
-END
-AbstractSAML2ProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAML2ProfileConfigurationBeanDefinitionParser.java
-END
-AbstractSAML1ProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAML1ProfileConfigurationFactoryBean.java
-END
-SAML2SSOProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/1059/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2SSOProfileConfigurationBeanDefinitionParser.java
-END
-AbstractSAML2ProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAML2ProfileConfigurationFactoryBean.java
-END
-SAML2SSOProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 173
-/java-shib-common/!svn/ver/1059/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2SSOProfileConfigurationFactoryBean.java
-END
-SAML2ECPProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ECPProfileConfigurationBeanDefinitionParser.java
-END
-SAML2ECPProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 173
-/java-shib-common/!svn/ver/1024/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ECPProfileConfigurationFactoryBean.java
-END
-ShibbolethSSOProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/ShibbolethSSOProfileConfigurationBeanDefinitionParser.java
-END
-ShibbolethSSOProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/ShibbolethSSOProfileConfigurationFactoryBean.java
-END
-SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 196
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java
-END
-SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 196
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java
-END
-AbstractSAMLProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/1060/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationBeanDefinitionParser.java
-END
-SAML1ArtifactResolutionProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 187
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML1ArtifactResolutionProfileConfigurationFactoryBean.java
-END
-SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/1045/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java
-END
-SAML2ArtifactResolutionProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 187
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2ArtifactResolutionProfileConfigurationFactoryBean.java
-END
-AbstractSAMLProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/1060/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationFactoryBean.java
-END
-SAML2LogoutRequestProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 182
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2LogoutRequestProfileConfigurationFactoryBean.java
-END
-SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java
-END
-SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java
-END
-SAML1AttributeQueryProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 183
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML1AttributeQueryProfileConfigurationFactoryBean.java
-END
-SAML2AttributeQueryProfileConfigurationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 183
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAML2AttributeQueryProfileConfigurationFactoryBean.java
-END
-SAMLRelyingPartyNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/SAMLRelyingPartyNamespaceHandler.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/entries
deleted file mode 100644
index 315a1ab..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/entries
+++ /dev/null
@@ -1,810 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-08T19:26:10.353043Z
-1060
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAML2ECPProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-4d3a9d9e9c2e4a5feff2d4e85ab0d0f4
-2012-06-07T16:35:21.548342Z
-1024
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2876
-

-ShibbolethSSOProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-f678b6d284d6872d00c17f40577a1d7b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2669
-

-ShibbolethSSOProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-f71fecdc99785dcf359d0bcc5dd33e29
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2472
-

-SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-0b598309df34bf060dde08af45413158
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1994
-

-SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-e042b12a11620e5a96b1f6c257980c52
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1994
-

-AbstractSAMLProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-76915391db3a592e2d8a745523fc4826
-2013-03-08T19:26:10.353043Z
-1060
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5935
-

-SAML1ArtifactResolutionProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-e07604330b4f4d8e202d1def4b5eae3b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1618
-

-SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-d47175a36307bed4340459b0abce0d14
-2012-11-26T20:36:00.086426Z
-1045
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1984
-

-SAML2ArtifactResolutionProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-5504a92604a9195728a6f108cebfaa11
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1618
-

-AbstractSAMLProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.206826Z
-2eaa68c607fe4b5d1f8f115e8823cace
-2013-03-08T19:26:10.353043Z
-1060
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7627
-

-SAML2LogoutRequestProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-9d2e8fef962dca18e72618ddaac11e25
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1593
-

-SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-21169ffdac5eeabe1d06fd719f50efd2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1991
-

-SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-fca6dc9e7d5932ad3a02e3d831dcb256
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1975
-

-SAML1AttributeQueryProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-be1d1cbf83e097b2b2cedf136dacebba
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1599
-

-SAML2AttributeQueryProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-33e5907d03794fe853488d1c1b4cc61d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1599
-

-SAMLRelyingPartyNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-842c7414baedb6dd1a9e6d01b2a0fec7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2862
-

-AbstractSAML1ProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-f397e50d4ed85bbf24bc40566a56e881
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1726
-

-AbstractSAML2ProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-5030922874caa97ba9bf42fa96c77588
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3544
-

-AbstractSAML1ProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-7af016e9556e902ae5e7cdd4864e31f4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2349
-

-SAML2SSOProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-4fbcae1c88995a50e6b36e4dc290165f
-2013-03-04T19:56:29.560315Z
-1059
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3582
-

-AbstractSAML2ProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-d370464e5d3f45d82b6a0fe6aa513fdd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5086
-

-SAML2SSOProfileConfigurationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-c82fbca4903315df40e165c1ccd5868b
-2013-03-04T19:56:29.560315Z
-1059
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4196
-

-SAML2ECPProfileConfigurationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:45.210826Z
-c6db75dcf7e9a63641e404624a67ffbd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1949
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML1ProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML1ProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML1ProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML1ProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML1ProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML1ProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML2ProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML2ProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML2ProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML2ProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML2ProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAML2ProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAMLProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAMLProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAMLProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAMLProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAMLProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/AbstractSAMLProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1AttributeQueryProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1AttributeQueryProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML1AttributeQueryProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2AttributeQueryProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2AttributeQueryProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2AttributeQueryProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ECPProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ECPProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ECPProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ECPProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ECPProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2ECPProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2LogoutRequestProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2LogoutRequestProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2LogoutRequestProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2SSOProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2SSOProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2SSOProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2SSOProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2SSOProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAML2SSOProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAMLRelyingPartyNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAMLRelyingPartyNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/SAMLRelyingPartyNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/ShibbolethSSOProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/ShibbolethSSOProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/ShibbolethSSOProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/ShibbolethSSOProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/ShibbolethSSOProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/prop-base/ShibbolethSSOProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML1ProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML1ProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 1d0b787..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML1ProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base Spring configuration parser for SAML 1 profile configurations.
- */
-public abstract class AbstractSAML1ProfileConfigurationBeanDefinitionParser extends
-        AbstractSAMLProfileConfigurationBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-        
-        builder.addPropertyReference("attributeAuthority", DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(
-                null, "attributeAuthority")));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML1ProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML1ProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index c60cb50..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML1ProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML1AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.AbstractSAML1ProfileConfiguration;
-
-/**
- * Base Spring factory bean for SAML 1 profile configurations.
- */
-abstract class AbstractSAML1ProfileConfigurationFactoryBean extends AbstractSAMLProfileConfigurationFactoryBean {
-    
-    /** Attribute authority for the profile configuration. */
-    private SAML1AttributeAuthority attributeAuthority;
-
-    /**
-     * Gets the attribute authority for the profile configuration.
-     * 
-     * @return attribute authority for the profile configuration
-     */
-    public SAML1AttributeAuthority getAttributeAuthority(){
-        return attributeAuthority;
-    }
-    
-    /**
-     * Sets the attribute authority for the profile configuration.
-     * 
-     * @param authority attribute authority for the profile configuration
-     */
-    public void setAttributeAuthority(SAML1AttributeAuthority authority){
-        attributeAuthority = authority;
-    }
-    
-    /**
-     * Populates the given profile configuration with standard information.
-     * 
-     * @param configuration configuration to populate
-     */
-    protected void populateBean(AbstractSAML1ProfileConfiguration configuration){
-        super.populateBean(configuration);
-        configuration.setAttributeAuthority(getAttributeAuthority());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML2ProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML2ProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ec76174..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML2ProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import java.util.List;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.LazyList;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Base Spring configuration parser for SAML 2 profile configurations.
- */
-public abstract class AbstractSAML2ProfileConfigurationBeanDefinitionParser extends
-        AbstractSAMLProfileConfigurationBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        List<Element> proxyAudiences = XMLHelper.getChildElementsByTagNameNS(element,
-                SAMLRelyingPartyNamespaceHandler.NAMESPACE, "ProxyAudience");
-        if (proxyAudiences != null && proxyAudiences.size() > 0) {
-            LazyList<String> audiences = new LazyList<String>();
-            for (Element proxyAudience : proxyAudiences) {
-                audiences.add(DatatypeHelper.safeTrimOrNullString(proxyAudience.getTextContent()));
-            }
-
-            builder.addPropertyValue("proxyAudiences", audiences);
-        }
-
-        builder.addPropertyReference("attributeAuthority", DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(
-                null, "attributeAuthority")));
-
-        if (element.hasAttributeNS(null, "encryptNameIds")) {
-            builder.addPropertyValue("encryptNameIds", CryptoOperationRequirementLevel.valueOf(element.getAttributeNS(
-                    null, "encryptNameIds")));
-        } else {
-            builder.addPropertyValue("encryptNameIds", CryptoOperationRequirementLevel.never);
-        }
-
-        if (element.hasAttributeNS(null, "encryptAssertions")) {
-            builder.addPropertyValue("encryptAssertions", CryptoOperationRequirementLevel.valueOf(element
-                    .getAttributeNS(null, "encryptAssertions")));
-        } else {
-            builder.addPropertyValue("encryptAssertions", CryptoOperationRequirementLevel.conditional);
-        }
-
-        if (element.hasAttributeNS(null, "assertionProxyCount")) {
-            builder.addPropertyValue("assertionProxyCount", Integer.parseInt(DatatypeHelper
-                    .safeTrimOrNullString(element.getAttributeNS(null, "assertionProxyCount"))));
-        } else {
-            builder.addPropertyValue("assertionProxyCount", 0);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML2ProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML2ProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 39fac8d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAML2ProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import java.util.List;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML2AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.AbstractSAML2ProfileConfiguration;
-
-/**
- * Base Spring factory bean for SAML 2 profile configurations.
- */
-public abstract class AbstractSAML2ProfileConfigurationFactoryBean extends AbstractSAMLProfileConfigurationFactoryBean {
-
-    /** Attribute authority for the profile configuration. */
-    private SAML2AttributeAuthority attributeAuthority;
-    
-    /** Whether to encrypt NameIDs. */
-    private CryptoOperationRequirementLevel encryptNameIds;
-
-    /** Whether to encryptAssertions. */
-    private CryptoOperationRequirementLevel encryptAssertions;
-
-    /** Maximum number of times an assertion may be proxied. */
-    private int assertionProxyCount;
-    
-    /** Audiences for proxied assertions. */
-    private List<String> proxyAudiences;
-
-    /**
-     * Gets the attribute authority for the profile configuration.
-     * 
-     * @return attribute authority for the profile configuration
-     */
-    public SAML2AttributeAuthority getAttributeAuthority(){
-        return attributeAuthority;
-    }
-    
-    /**
-     * Sets the attribute authority for the profile configuration.
-     * 
-     * @param authority attribute authority for the profile configuration
-     */
-    public void setAttributeAuthority(SAML2AttributeAuthority authority){
-        attributeAuthority = authority;
-    }
-    
-    /**
-     * Gets the maximum number of times an assertion may be proxied.
-     * 
-     * @return maximum number of times an assertion may be proxied
-     */
-    public int getAssertionProxyCount() {
-        return assertionProxyCount;
-    }
-
-    /**
-     * Sets the maximum number of times an assertion may be proxied.
-     * 
-     * @param count maximum number of times an assertion may be proxied
-     */
-    public void setAssertionProxyCount(int count) {
-        assertionProxyCount = count;
-    }
-
-    /**
-     * Gets whether to encryption assertions.
-     * 
-     * @return whether to encryption assertions
-     */
-    public CryptoOperationRequirementLevel isEncryptAssertions() {
-        return encryptAssertions;
-    }
-
-    /**
-     * Sets whether to encryption assertions.
-     * 
-     * @param encrypt whether to encryption assertions
-     */
-    public void setEncryptAssertions(CryptoOperationRequirementLevel encrypt) {
-        encryptAssertions = encrypt;
-    }
-
-    /**
-     * Gets whether to encrypt NameIDs.
-     * 
-     * @return whether to encrypt NameIDs
-     */
-    public CryptoOperationRequirementLevel isEncryptNameIds() {
-        return encryptNameIds;
-    }
-
-    /**
-     * Sets whether to encrypt NameIDs.
-     * 
-     * @param encrypt whether to encrypt NameIDs
-     */
-    public void setEncryptNameIds(CryptoOperationRequirementLevel encrypt) {
-        encryptNameIds = encrypt;
-    }
-    
-    /**
-     * Gets the audiences for proxied assertions.
-     * 
-     * @return audiences for proxied assertions
-     */
-    public List<String> getProxyAudiences(){
-        return proxyAudiences;
-    }
-    
-    /**
-     * Sets the audiences for proxied assertions.
-     * 
-     * @param audiences audiences for proxied assertions
-     */
-    public void setProxyAudiences(List<String> audiences){
-        proxyAudiences = audiences;
-    }
-    
-    /**
-     * Populates the given profile configuration with standard information.
-     * 
-     * @param configuration configuration to populate
-     */
-    protected void populateBean(AbstractSAML2ProfileConfiguration configuration){
-        super.populateBean(configuration);
-        
-        configuration.setAttributeAuthority(getAttributeAuthority());
-        configuration.setEncryptAssertion(isEncryptAssertions());
-        configuration.setEncryptNameID(isEncryptNameIds());
-        configuration.setProxyCount(getAssertionProxyCount());
-        
-        if(getProxyAudiences() != null){
-            configuration.getProxyAudiences().addAll(getProxyAudiences());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAMLProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAMLProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 6533044..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAMLProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.LazyList;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Base Spring configuration parser for SAML profile configurations.
- */
-public abstract class AbstractSAMLProfileConfigurationBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        builder.setLazyInit(true);
-        Map<QName, List<Element>> children = XMLHelper.getChildElements(element);
-
-        List<Element> audienceElems = children.get(new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE, "Audience"));
-        if (audienceElems != null && audienceElems.size() > 0) {
-            LazyList<String> audiences = new LazyList<String>();
-            for (Element audienceElem : audienceElems) {
-                audiences.add(DatatypeHelper.safeTrimOrNullString(audienceElem.getTextContent()));
-            }
-            builder.addPropertyValue("audiences", audiences);
-        }
-
-        String secCredRef = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "signingCredentialRef"));
-        if (secCredRef != null) {
-            builder.addDependsOn(secCredRef);
-            builder.addPropertyReference("signingCredential", secCredRef);
-        }
-
-        long lifetime = 300000L;
-        if (element.hasAttributeNS(null, "assertionLifetime")) {
-            lifetime = SpringConfigurationUtils.parseDurationToMillis(
-                    "'assertionLifetime' on profile configuration of type " + XMLHelper.getXSIType(element),
-                    element.getAttributeNS(null, "assertionLifetime"), 0);
-        }
-        builder.addPropertyValue("assertionLifetime", lifetime);
-
-        if (element.hasAttributeNS(null, "includeConditionsNotBefore")) {
-            builder.addPropertyValue("includeConditionsNotBefore",
-                    XMLHelper.getAttributeValueAsBoolean(
-                            element.getAttributeNodeNS(null, "includeConditionsNotBefore")));
-        } else {
-            builder.addPropertyValue("includeConditionsNotBefore", true);
-        }
-
-        String artifactType = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "outboundArtifactType"));
-        if (artifactType != null) {
-            byte[] artifactTypeBytes = DatatypeHelper.intToByteArray(Integer.parseInt(artifactType));
-            byte[] trimmedArtifactTypeBytes = { artifactTypeBytes[2], artifactTypeBytes[3] };
-            builder.addPropertyValue("outboundArtifactType", trimmedArtifactTypeBytes);
-        }
-
-        CryptoOperationRequirementLevel signRequests = CryptoOperationRequirementLevel.conditional;
-        if (element.hasAttributeNS(null, "signRequests")) {
-            signRequests = CryptoOperationRequirementLevel.valueOf(element.getAttributeNS(null, "signRequests"));
-        }
-        builder.addPropertyValue("signRequests", signRequests);
-
-        CryptoOperationRequirementLevel signResponses = getSignResponsesDefault();
-        if (element.hasAttributeNS(null, "signResponses")) {
-            signResponses = CryptoOperationRequirementLevel.valueOf(element.getAttributeNS(null, "signResponses"));
-        }
-        builder.addPropertyValue("signResponses", signResponses);
-
-        CryptoOperationRequirementLevel signAssertions = getSignAssertionsDefault();
-        if (element.hasAttributeNS(null, "signAssertions")) {
-            signAssertions = CryptoOperationRequirementLevel.valueOf(element.getAttributeNS(null, "signAssertions"));
-        }
-        builder.addPropertyValue("signAssertions", signAssertions);
-
-        String secPolRef = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "securityPolicyRef"));
-        if (secPolRef != null) {
-            builder.addDependsOn(secPolRef);
-            builder.addPropertyReference("profileSecurityPolicy", secPolRef);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /**
-     * Gets the default value for the signResponses property.
-     * 
-     * @return default value for the signResponses property
-     */
-    protected abstract CryptoOperationRequirementLevel getSignResponsesDefault();
-
-    /**
-     * Gets the default value for the signAssertions property.
-     * 
-     * @return default value for the signAssertions property
-     */
-    protected abstract CryptoOperationRequirementLevel getSignAssertionsDefault();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAMLProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAMLProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 8a7686b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/AbstractSAMLProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import java.util.List;
-
-import org.opensaml.ws.security.SecurityPolicy;
-import org.opensaml.xml.security.credential.Credential;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.AbstractSAMLProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Base Spring factory bean for creating SAML profile configurations.
- */
-public abstract class AbstractSAMLProfileConfigurationFactoryBean extends AbstractFactoryBean {
-
-    /** Audiences of issued assertions. */
-    private List<String> audiences;
-
-    /** Amount of time before an issued assertion expires. */
-    private long assertionLifetime;
-
-    /** Whether assertions should include a NotBefore condition. */
-    private boolean includeConditionsNotBefore;
-
-    /** 2-byte artifact type used for outbound messages. */
-    private byte[] outboundArtifactType;
-
-    /** Whether assertions should be signed. */
-    private CryptoOperationRequirementLevel signAssertions;
-
-    /** Whether to sign protocol requests. */
-    private CryptoOperationRequirementLevel signRequests;
-
-    /** Whether to sign protocol responses. */
-    private CryptoOperationRequirementLevel signResponses;
-
-    /** Credential used to sign assertions. */
-    private Credential signingCredential;
-    
-    /** Security policy for this profile. */
-    private SecurityPolicy profileSecurityPolicy;
-    
-    /**
-     * Gets the amount of time, in milliseconds, before an issued assertion expires. A negative value indicates the
-     * assertion never expires.
-     * 
-     * @return amount of time before an issued assertion expires
-     */
-    public long getAssertionLifetime() {
-        return assertionLifetime;
-    }
-    
-    /**
-     * Gets the audiences of issued assertions.
-     * 
-     * @return audiences of issued assertions
-     */
-    public List<String> getAudiences() {
-        return audiences;
-    }
-
-    /**
-     * Gets whether assertions should include a NotBefore condition.
-     *
-     * @return whether assertions should include a NotBefore condition
-     */
-    public boolean includeConditionsNotBefore() {
-        return includeConditionsNotBefore;
-    }
-
-    /**
-     * Gets the 2-byte artifact type used for outbound messages.
-     * 
-     * @return 2-byte artifact type used for outbound messages
-     */
-    public  byte[] getOutboundArtifactType() {
-        return outboundArtifactType;
-    }
-
-    /**
-     * Gets the security policy for this profile.
-     * 
-     * @return security policy for this profile
-     */
-    public SecurityPolicy getProfileSecurityPolicy() {
-        return profileSecurityPolicy;
-    }
-
-    /**
-     * Gets whether assertions should be signed.
-     * 
-     * @return whether assertions should be signed
-     */
-    public CryptoOperationRequirementLevel getSignAssertions() {
-        return signAssertions;
-    }
-
-    /**
-     * Gets the credential used to sign assertions.
-     * 
-     * @return credential used to sign assertions
-     */
-    public Credential getSigningCredential() {
-        return signingCredential;
-    }
-
-    /**
-     * Gets whether to sign protocol requests.
-     * 
-     * @return whether to sign protocol requests
-     */
-    public CryptoOperationRequirementLevel getSignRequests() {
-        return signRequests;
-    }
-
-    /**
-     * Gets whether to sign protocol responses.
-     * 
-     * @return whether to sign protocol responses
-     */
-    public CryptoOperationRequirementLevel getSignResposnes() {
-        return signResponses;
-    }
-
-    /**
-     * Sets the amount of time before an issued assertion expires.
-     * 
-     * @param lifetime amount of time before an issued assertion expires
-     */
-    public void setAssertionLifetime(long lifetime) {
-        assertionLifetime = lifetime;
-    }
-
-    /**
-     * Sets the audiences of issued assertions.
-     * 
-     * @param newAudiences audiences of issued assertions
-     */
-    public void setAudiences(List<String> newAudiences) {
-        audiences = newAudiences;
-    }
-
-    /**
-     * Sets whether assertions should include a NotBefore condition.
-     *
-     * @param include whether assertions should include a NotBefore condition
-     */
-    public void setIncludeConditionsNotBefore(boolean include) {
-        includeConditionsNotBefore = include;
-    }
-
-    /**
-     * Sets the 2-byte artifact type used for outbound messages.
-     * 
-     * @param type 2-byte artifact type used for outbound messages
-     */
-    public void setOutboundArtifactType(byte[] type) {
-        outboundArtifactType = type;
-    }
-
-    /**
-     * Sets the security policy for this profile.
-     * 
-     * @param policy security policy for this profile
-     */
-    public void setProfileSecurityPolicy(SecurityPolicy policy) {
-        profileSecurityPolicy = policy;
-    }
-
-    /**
-     * Sets whether assertions should be signed.
-     * 
-     * @param sign whether assertions should be signed
-     */
-    public void setSignAssertions(CryptoOperationRequirementLevel sign) {
-        signAssertions = sign;
-    }
-
-    /**
-     * Sets the credential used to sign assertions.
-     * 
-     * @param credential credential used to sign assertions
-     */
-    public void setSigningCredential(Credential credential) {
-        signingCredential = credential;
-    }
-
-    /**
-     * Sets whether to sign protocol requests.
-     * 
-     * @param sign whether to sign protocol requests
-     */
-    public void setSignRequests(CryptoOperationRequirementLevel sign) {
-        signRequests = sign;
-    }
-
-    /**
-     * Sets whether to sign protocol responses.
-     * 
-     * @param sign whether to sign protocol responses
-     */
-    public void setSignResponses(CryptoOperationRequirementLevel sign) {
-        signResponses = sign;
-    }
-    
-    /**
-     * Populates the given profile configuration with standard information.
-     * 
-     * @param configuration configuration to populate
-     */
-    protected void populateBean(AbstractSAMLProfileConfiguration configuration) {
-        configuration.setAssertionAudiences(getAudiences());
-        configuration.setAssertionLifetime(getAssertionLifetime());
-        configuration.setIncludeConditionsNotBefore(includeConditionsNotBefore());
-        configuration.setSecurityPolicy(getProfileSecurityPolicy());
-        configuration.setOutboundArtifactType(getOutboundArtifactType());
-        configuration.setSignRequests(getSignRequests());
-        configuration.setSignResponses(getSignResposnes());
-        configuration.setSignAssertions(getSignAssertions());
-        configuration.setSigningCredential(getSigningCredential());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index cfdc035..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Spring configuration parser for SAML 1 artifact query profile configurations.
- */
-public class SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser extends
-        AbstractSAML1ProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE,
-            "SAML1ArtifactResolutionProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML1ArtifactResolutionProfileConfigurationFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignAssertionsDefault() {
-        return CryptoOperationRequirementLevel.never;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignResponsesDefault() {
-        return CryptoOperationRequirementLevel.conditional;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index b3cf3fb..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.ArtifactResolutionConfiguration;
-
-/**
- * Spring factory for SAML 1 artifact query profile configurations.
- */
-public class SAML1ArtifactResolutionProfileConfigurationFactoryBean extends AbstractSAML1ProfileConfigurationFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ArtifactResolutionConfiguration.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        ArtifactResolutionConfiguration configuration = new ArtifactResolutionConfiguration();
-        
-        populateBean(configuration);
-
-        return configuration;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index f91ab02..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Spring configuration parser for SAML 1 attribute query profile configurations.
- */
-public class SAML1AttributeQueryProfileConfigurationBeanDefinitionParser extends
-        AbstractSAML1ProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE,
-            "SAML1AttributeQueryProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML1AttributeQueryProfileConfigurationFactoryBean.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignAssertionsDefault() {
-        return CryptoOperationRequirementLevel.never;
-    }
-    
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignResponsesDefault() {
-        return CryptoOperationRequirementLevel.conditional;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1AttributeQueryProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1AttributeQueryProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 90886aa..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML1AttributeQueryProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.AttributeQueryConfiguration;
-
-/**
- * Spring factory for SAML 1 attribute query profile configurations.
- */
-public class SAML1AttributeQueryProfileConfigurationFactoryBean extends AbstractSAML1ProfileConfigurationFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return AttributeQueryConfiguration.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        AttributeQueryConfiguration configuration = new AttributeQueryConfiguration();
-        
-        populateBean(configuration);
-
-        return configuration;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 3098f2d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Spring configuration parser for SAML 2 artifact resolution profile configurations.
- */
-public class SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser extends
-        AbstractSAML2ProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE,
-            "SAML2ArtifactResolutionProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2ArtifactResolutionProfileConfigurationFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignAssertionsDefault() {
-        return CryptoOperationRequirementLevel.always;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignResponsesDefault() {
-        return CryptoOperationRequirementLevel.never;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 28c64b6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ArtifactResolutionProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.ArtifactResolutionConfiguration;
-
-/**
- * Spring factory for SAML 2 artifact query profile configurations.
- */
-public class SAML2ArtifactResolutionProfileConfigurationFactoryBean extends
-        AbstractSAML2ProfileConfigurationFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ArtifactResolutionConfiguration.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        ArtifactResolutionConfiguration configuration = new ArtifactResolutionConfiguration();
-
-        populateBean(configuration);
-
-        return configuration;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a7dd8d7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Spring configuration parser for SAML 2 attribute query configurations.
- */
-public class SAML2AttributeQueryProfileConfigurationBeanDefinitionParser extends
-        AbstractSAML2ProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE,
-            "SAML2AttributeQueryProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2AttributeQueryProfileConfigurationFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignAssertionsDefault() {
-        return CryptoOperationRequirementLevel.never;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignResponsesDefault() {
-        return CryptoOperationRequirementLevel.conditional;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2AttributeQueryProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2AttributeQueryProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 363da42..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2AttributeQueryProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.AttributeQueryConfiguration;
-
-/**
- * Spring factory for SAML 2 attribute query profile configurations.
- */
-public class SAML2AttributeQueryProfileConfigurationFactoryBean extends AbstractSAML2ProfileConfigurationFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return AttributeQueryConfiguration.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        AttributeQueryConfiguration configuration = new AttributeQueryConfiguration();
-        
-        populateBean(configuration);
-
-        return configuration;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ECPProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ECPProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 247ca76..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ECPProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.relyingparty.saml.SAML2SSOProfileConfigurationBeanDefinitionParser;
-
-/** Spring configuration parser for ecp SAML 2 SSO profile configurations. */
-public class SAML2ECPProfileConfigurationBeanDefinitionParser extends
-        SAML2SSOProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME =
-        new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE, "SAML2ECPProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2ECPProfileConfigurationFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ECPProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ECPProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 8ce4375..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2ECPProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.ECPConfiguration;
-
-/** Spring factory for ECP SAML 2 SSO profile configurations. */
-public class SAML2ECPProfileConfigurationFactoryBean extends SAML2SSOProfileConfigurationFactoryBean {
-
-    // We convert CryptoOperationRequirementLevel.conditional to CryptoOperationRequirementLevel.always because
-    // in front-channel ECP only always/never make sense
-
-    /** {@inheritDoc} */
-    public void setEncryptAssertions(CryptoOperationRequirementLevel encrypt) {
-        if (encrypt == CryptoOperationRequirementLevel.conditional) {
-            super.setEncryptAssertions(CryptoOperationRequirementLevel.always);
-        } else {
-            super.setEncryptAssertions(encrypt);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void setEncryptNameIds(CryptoOperationRequirementLevel encrypt) {
-        if (encrypt == CryptoOperationRequirementLevel.conditional) {
-            super.setEncryptNameIds(CryptoOperationRequirementLevel.always);
-        } else {
-            super.setEncryptNameIds(encrypt);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void setSignAssertions(CryptoOperationRequirementLevel sign) {
-        if (sign == CryptoOperationRequirementLevel.conditional) {
-            super.setSignAssertions(CryptoOperationRequirementLevel.always);
-        } else {
-            super.setSignAssertions(sign);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void setSignResponses(CryptoOperationRequirementLevel sign) {
-        if (sign == CryptoOperationRequirementLevel.conditional) {
-            super.setSignResponses(CryptoOperationRequirementLevel.always);
-        } else {
-            super.setSignResponses(sign);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ECPConfiguration.class;
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index e531008..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Spring configuration parser for SAML 2 logout request profile configurations.
- */
-public class SAML2LogoutRequestProfileConfigurationBeanDefinitionParser extends
-        AbstractSAML2ProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE,
-            "SAML2LogoutRequestProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return SAML2LogoutRequestProfileConfigurationFactoryBean.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignAssertionsDefault() {
-        return CryptoOperationRequirementLevel.never;
-    }
-    
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignResponsesDefault() {
-        return CryptoOperationRequirementLevel.conditional;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2LogoutRequestProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2LogoutRequestProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index c5fa1ad..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2LogoutRequestProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.LogoutRequestConfiguration;
-
-/**
- * Spring factory for SAML 2 logout request profile configurations.
- */
-public class SAML2LogoutRequestProfileConfigurationFactoryBean extends AbstractSAML2ProfileConfigurationFactoryBean {
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return LogoutRequestConfiguration.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        LogoutRequestConfiguration configuration = new LogoutRequestConfiguration();
-        
-        populateBean(configuration);
-
-        return configuration;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2SSOProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2SSOProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 0c2933c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2SSOProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/** Spring configuration parser for SAML 2 SSO profile configurations. */
-public class SAML2SSOProfileConfigurationBeanDefinitionParser extends
-        AbstractSAML2ProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE, "SAML2SSOProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2SSOProfileConfigurationFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        if (element.hasAttributeNS(null, "includeAttributeStatement")) {
-            builder.addPropertyValue("includeAttributeStatement",
-                    XMLHelper.getAttributeValueAsBoolean(
-                            element.getAttributeNodeNS(null, "includeAttributeStatement")));
-        } else {
-            builder.addPropertyValue("includeAttributeStatement", true);
-        }
-
-        if (element.hasAttributeNS(null, "maximumSPSessionLifetime")) {
-            long lifetime = SpringConfigurationUtils.parseDurationToMillis(
-                    "'maximumSPSessionLifetime' on profile configuration of type " + XMLHelper.getXSIType(element),
-                    element.getAttributeNS(null, "maximumSPSessionLifetime"), 0);
-            builder.addPropertyValue("maximumSPSessionLifetime", lifetime);
-        }
-
-        if (element.hasAttributeNS(null, "skipEndpointValidationWhenSigned")) {
-            builder.addPropertyValue("skipEndpointValidationWhenSigned", XMLHelper.getAttributeValueAsBoolean(
-                    element.getAttributeNodeNS(null, "skipEndpointValidationWhenSigned")));
-        } else {
-            builder.addPropertyValue("skipEndpointValidationWhenSigned", false);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignAssertionsDefault() {
-        return CryptoOperationRequirementLevel.always;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignResponsesDefault() {
-        return CryptoOperationRequirementLevel.never;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2SSOProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2SSOProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 14b9e85..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAML2SSOProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.SSOConfiguration;
-
-/** Spring factory for SAML 2 SSO profile configurations. */
-public class SAML2SSOProfileConfigurationFactoryBean extends AbstractSAML2ProfileConfigurationFactoryBean {
-
-    /** Whether responses to the authentication request should include an attribute statement. */
-    private boolean includeAttributeStatement;
-
-    /** The maximum amount of time, in milliseconds, the service provider should maintain a session for the user. */
-    private long maximumSPSessionLifetime;
-    
-    /** Whether to skip response location checks for signed requests. */
-    private boolean skipEndpointValidationWhenSigned;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return SSOConfiguration.class;
-    }
-
-    /**
-     * Gets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @return whether responses to the authentication request should include an attribute statement
-     */
-    public boolean includeAttributeStatement() {
-        return includeAttributeStatement;
-    }
-
-    /**
-     * Sets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @param include whether responses to the authentication request should include an attribute statement
-     */
-    public void setIncludeAttributeStatement(boolean include) {
-        includeAttributeStatement = include;
-    }
-
-    /**
-     * Gets the maximum amount of time, in milliseconds, the service provider should maintain a session for the user
-     * based on the authentication assertion.
-     * 
-     * @return max lifetime of service provider should maintain a session
-     */
-    public long getMaximumSPSessionLifetime() {
-        return maximumSPSessionLifetime;
-    }
-
-    /**
-     * Sets the maximum amount of time, in milliseconds, the service provider should maintain a session for the user
-     * based on the authentication assertion.
-     * 
-     * @param lifetime max lifetime of service provider should maintain a session
-     */
-    public void setMaximumSPSessionLifetime(long lifetime) {
-        maximumSPSessionLifetime = lifetime;
-    }
-    
-    /**
-     * Gets whether to bypass ACS checks for signed requests.
-     * @return  true iff ACS checking should be bypassed for signed requests
-     */
-    public boolean skipEndpointValidationWhenSigned() {
-        return skipEndpointValidationWhenSigned;
-    }
-    
-    /**
-     * Sets whether to bypass ACS checks for signed requests.
-     * @param flag  whether to bypass ACS checks for signed requests
-     */
-    public void setSkipEndpointValidationWhenSigned(boolean flag) {
-        skipEndpointValidationWhenSigned = flag;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        SSOConfiguration configuration = (SSOConfiguration) getObjectType().newInstance();
-        populateBean(configuration);
-        configuration.setIncludeAttributeStatement(includeAttributeStatement());
-        configuration.setMaximumSPSessionLifetime(getMaximumSPSessionLifetime());
-        configuration.setSkipEndpointValidationWhenSigned(skipEndpointValidationWhenSigned());
-
-        return configuration;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAMLRelyingPartyNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAMLRelyingPartyNamespaceHandler.java.svn-base
deleted file mode 100644
index c90c53f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/SAMLRelyingPartyNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for the Shibboleth relying party namespace.
- */
-public class SAMLRelyingPartyNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:relying-party:saml";
-
-    /** {@inheritDoc} */
-    public void init() {
-
-        registerBeanDefinitionParser(ShibbolethSSOProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new ShibbolethSSOProfileConfigurationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML1AttributeQueryProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new SAML1AttributeQueryProfileConfigurationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new SAML1ArtifactResolutionProfileConfigurationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2SSOProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new SAML2SSOProfileConfigurationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2ECPProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new SAML2ECPProfileConfigurationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2LogoutRequestProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new SAML2LogoutRequestProfileConfigurationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2AttributeQueryProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new SAML2AttributeQueryProfileConfigurationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser.TYPE_NAME,
-                new SAML2ArtifactResolutionProfileConfigurationBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/ShibbolethSSOProfileConfigurationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/ShibbolethSSOProfileConfigurationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a709185..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/ShibbolethSSOProfileConfigurationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * Spring configuration parser for Shibboleth SSO profile configurations.
- */
-public class ShibbolethSSOProfileConfigurationBeanDefinitionParser extends
-        AbstractSAML1ProfileConfigurationBeanDefinitionParser {
-
-    /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(SAMLRelyingPartyNamespaceHandler.NAMESPACE, "ShibbolethSSOProfile");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ShibbolethSSOProfileConfigurationFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-
-        if (element.hasAttributeNS(null, "includeAttributeStatement")) {
-            builder.addPropertyValue("includeAttributeStatement",
-                    XMLHelper.getAttributeValueAsBoolean(element.getAttributeNodeNS(null, "includeAttributeStatement")));
-        } else {
-            builder.addPropertyValue("includeAttributeStatement", false);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignAssertionsDefault() {
-        return CryptoOperationRequirementLevel.never;
-    }
-
-    /** {@inheritDoc} */
-    protected CryptoOperationRequirementLevel getSignResponsesDefault() {
-        return CryptoOperationRequirementLevel.always;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/ShibbolethSSOProfileConfigurationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/ShibbolethSSOProfileConfigurationFactoryBean.java.svn-base
deleted file mode 100644
index 5c020fd..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/.svn/text-base/ShibbolethSSOProfileConfigurationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty.saml;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1.ShibbolethSSOConfiguration;
-
-/**
- * Spring factory for Shibboleth SSO profile configurations.
- */
-public class ShibbolethSSOProfileConfigurationFactoryBean extends AbstractSAML1ProfileConfigurationFactoryBean {
-    
-    /** Whether responses to the authentication request should include an attribute statement. */
-    private boolean includeAttributeStatement;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ShibbolethSSOConfiguration.class;
-    }
-
-    /**
-     * Gets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @return whether responses to the authentication request should include an attribute statement
-     */
-    public boolean includeAttributeStatement() {
-        return includeAttributeStatement;
-    }
-
-    /**
-     * Sets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @param include whether responses to the authentication request should include an attribute statement
-     */
-    public void setIncludeAttributeStatement(boolean include) {
-        includeAttributeStatement = include;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        ShibbolethSSOConfiguration configuration = new ShibbolethSSOConfiguration();
-        populateBean(configuration);
-        configuration.setIncludeAttributeStatement(includeAttributeStatement());
-
-        return configuration;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/all-wcprops
deleted file mode 100644
index da2438f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/all-wcprops
+++ /dev/null
@@ -1,59 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 118
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource
-END
-ResourceNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ResourceNamespaceHandler.java
-END
-HttpResourceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/HttpResourceBeanDefinitionParser.java
-END
-ClasspathResourceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 161
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ClasspathResourceBeanDefinitionParser.java
-END
-AbstractResourceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/AbstractResourceBeanDefinitionParser.java
-END
-FilesystemResourceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/FilesystemResourceBeanDefinitionParser.java
-END
-ChainingResourceFilterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/ChainingResourceFilterBeanDefinitionParser.java
-END
-SVNResourceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/SVNResourceBeanDefinitionParser.java
-END
-FileBackedHttpResourceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/FileBackedHttpResourceBeanDefinitionParser.java
-END
-PropertyReplacementResourceFilterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/PropertyReplacementResourceFilterBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/entries
deleted file mode 100644
index 0e09581..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/entries
+++ /dev/null
@@ -1,334 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ResourceNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:44.198806Z
-d5733bfb742372d43b50f2de0ada62b0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2371
-

-HttpResourceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.198806Z
-88ce12ea70dd43c3eb6f64534abf5860
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2292
-

-ClasspathResourceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.198806Z
-5b04ea7fd84d29ce016fc817bf5d306a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2324
-

-AbstractResourceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.198806Z
-f11f1a148d636ea0c1554cc0ca96a053
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2068
-

-FilesystemResourceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.202806Z
-da43a36790ea7c9317ce1c357318af0c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3017
-

-ChainingResourceFilterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.202806Z
-a524aa6632b4fdf8da5c671ab44bdaf8
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2569
-

-SVNResourceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.202806Z
-e47c22f0607cf5d4a1c532e334fc049c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-22636
-

-FileBackedHttpResourceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.202806Z
-69b6e2581a97e9e95388631a8ad5b5b5
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3321
-

-PropertyReplacementResourceFilterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.202806Z
-0e805d1746a16e0ca0fe946839c60125
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2459
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/AbstractResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/AbstractResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/AbstractResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ChainingResourceFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ChainingResourceFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ChainingResourceFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ClasspathResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ClasspathResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ClasspathResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/FileBackedHttpResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/FileBackedHttpResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/FileBackedHttpResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/FilesystemResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/FilesystemResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/FilesystemResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/HttpResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/HttpResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/HttpResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/PropertyReplacementResourceFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/PropertyReplacementResourceFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/PropertyReplacementResourceFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ResourceNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ResourceNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/ResourceNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/SVNResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/SVNResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/prop-base/SVNResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/AbstractResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/AbstractResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 19cc6a2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/AbstractResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import java.util.List;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Base class {@link org.opensaml.util.resource.Resource} for bean definition parsers. */
-public abstract class AbstractResourceBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    protected BeanDefinition addResourceFilter(Element element, ParserContext parserContext,
-            BeanDefinitionBuilder builder) {
-        List<Element> resFilter = XMLHelper.getChildElementsByTagNameNS(element, ResourceNamespaceHandler.NAMESPACE,
-                "ResourceFilter");
-        if (!resFilter.isEmpty()) {
-            builder.addPropertyValue("resourceFilter", SpringConfigurationUtils.parseInnerCustomElement(resFilter.get(0), parserContext));
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ChainingResourceFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ChainingResourceFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 1615e21..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ChainingResourceFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.util.resource.ChainingResourceFilter;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Bean definition parser for {@link ChainingResourceFilter}s. */
-public class ChainingResourceFilterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ResourceNamespaceHandler.NAMESPACE, "Chaining");
-
-    /** Class logger. */
-    private Logger log = LoggerFactory.getLogger(ChainingResourceFilterBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return ChainingResourceFilter.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        List<Element> childFilters = XMLHelper.getChildElementsByTagNameNS(element, ResourceNamespaceHandler.NAMESPACE, "ResourceFilter");
-        log.debug("Processing {} child filters.", childFilters.size());
-        builder.addConstructorArgValue(SpringConfigurationUtils.parseInnerCustomElements(childFilters, parserContext));
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ClasspathResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ClasspathResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ea918e5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ClasspathResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.util.resource.ClasspathResource;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Bean definition parser for {@link ClasspathResource}s. */
-public class ClasspathResourceBeanDefinitionParser extends AbstractResourceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ResourceNamespaceHandler.NAMESPACE, "ClasspathResource");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return ClasspathResource.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        return ClasspathResource.class.getName() + ":"
-                + DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, "file"));
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "file")));
-        addResourceFilter(element, parserContext, builder);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/FileBackedHttpResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/FileBackedHttpResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a049d9c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/FileBackedHttpResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.util.resource.FileBackedHttpResource;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Bean definition parser for {@link FileBackedHttpResource}s. */
-public class FileBackedHttpResourceBeanDefinitionParser extends AbstractResourceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ResourceNamespaceHandler.NAMESPACE, "FileBackedHttpResource");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(FileBackedHttpResourceBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return FileBackedHttpResource.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        return FileBackedHttpResource.class.getName() + ":("
-                + DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, "url")) + ","
-                + DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, "file")) + ")";
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(element, parserContext, builder);
-        builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "url")));
-
-        String file = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "file"));
-        if (file.startsWith("file:")) {
-            try {
-                builder.addConstructorArgValue(new URI(file));
-            } catch (URISyntaxException e) {
-                log.error("Illegal file: URI syntax", e);
-                throw new BeanCreationException("Illegal file: URI syntax");
-            }
-        } else {
-            builder.addConstructorArgValue(file);
-        }
-
-        addResourceFilter(element, parserContext, builder);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/FilesystemResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/FilesystemResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a60df1f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/FilesystemResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.util.resource.FilesystemResource;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Bean definition parser for {@link FilesystemResource}s. */
-public class FilesystemResourceBeanDefinitionParser extends AbstractResourceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ResourceNamespaceHandler.NAMESPACE, "FilesystemResource");
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(FilesystemResourceBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return FilesystemResource.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        return FilesystemResource.class.getName() + ":"
-                + DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, "file"));
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-
-        String file = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "file"));
-        if(file.startsWith("file:")){
-            try{
-                builder.addConstructorArgValue(new URI(file));
-            }catch(URISyntaxException e){
-                log.error("Illegal file: URI syntax", e);
-                throw new BeanCreationException("Illegal file: URI syntax");
-            }
-        }else{
-            builder.addConstructorArgValue(file);
-        }
-        
-        addResourceFilter(element, parserContext, builder);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/HttpResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/HttpResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b45ddad..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/HttpResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.util.resource.HttpResource;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Bean definition parser for {@link HttpResource}s. */
-public class HttpResourceBeanDefinitionParser extends AbstractResourceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ResourceNamespaceHandler.NAMESPACE, "HttpResource");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return HttpResource.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        return HttpResource.class.getName() + ":"
-                + DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, "url"));
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgValue(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "url")));
-        addResourceFilter(element, parserContext, builder);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/PropertyReplacementResourceFilterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/PropertyReplacementResourceFilterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 48299ec..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/PropertyReplacementResourceFilterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import java.io.File;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.util.resource.PropertyReplacementResourceFilter;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Bean definition parser for {@link PropertyReplacementResourceFilter}s. */
-public class PropertyReplacementResourceFilterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ResourceNamespaceHandler.NAMESPACE, "PropertyReplacement");
-
-    /** Class logger. */
-    private Logger log = LoggerFactory.getLogger(PropertyReplacementResourceFilterBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return PropertyReplacementResourceFilter.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        File propertyFile = new File(DatatypeHelper.safeTrim(element.getAttributeNS(null, "propertyFile")));
-        log.debug("Property file: {}", propertyFile.getAbsolutePath());
-
-        builder.addConstructorArgValue(propertyFile);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ResourceNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ResourceNamespaceHandler.java.svn-base
deleted file mode 100644
index 075b0e9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/ResourceNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/** Namespace handler for resources. */
-public class ResourceNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace URI. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:resource";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(ClasspathResourceBeanDefinitionParser.SCHEMA_TYPE,
-                new ClasspathResourceBeanDefinitionParser());
-
-        registerBeanDefinitionParser(FilesystemResourceBeanDefinitionParser.SCHEMA_TYPE,
-                new FilesystemResourceBeanDefinitionParser());
-
-        registerBeanDefinitionParser(HttpResourceBeanDefinitionParser.SCHEMA_TYPE,
-                new HttpResourceBeanDefinitionParser());
-
-        registerBeanDefinitionParser(FileBackedHttpResourceBeanDefinitionParser.SCHEMA_TYPE,
-                new FileBackedHttpResourceBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SVNResourceBeanDefinitionParser.SCHEMA_TYPE, 
-                new SVNResourceBeanDefinitionParser());
-
-        registerBeanDefinitionParser(PropertyReplacementResourceFilterBeanDefinitionParser.SCHEMA_TYPE,
-                new PropertyReplacementResourceFilterBeanDefinitionParser());
-
-        registerBeanDefinitionParser(ChainingResourceFilterBeanDefinitionParser.SCHEMA_TYPE,
-                new ChainingResourceFilterBeanDefinitionParser());
-
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/SVNResourceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/SVNResourceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 07ec584..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/resource/.svn/text-base/SVNResourceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.resource;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.auth.SVNAuthentication;
-import org.tmatesoft.svn.core.auth.SVNPasswordAuthentication;
-import org.tmatesoft.svn.core.auth.SVNUserNameAuthentication;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-import edu.internet2.middleware.shibboleth.common.resource.SVNBasicAuthenticationManager;
-import edu.internet2.middleware.shibboleth.common.resource.SVNResource;
-
-/** Bean definition parser for {@link SVNResource}s. */
-public class SVNResourceBeanDefinitionParser extends AbstractResourceBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ResourceNamespaceHandler.NAMESPACE, "SVNResource");
-
-    /** Configuration element attribute {@value} which holds the URL to the remote repository. */
-    public static final String REPOSITORY_URL_ATTRIB_NAME = "repositoryURL";
-
-    /** Configuration element attribute {@value} which holds the timeout used when connecting to the SVN server. */
-    public static final String CTX_TIMEOUT_ATTRIB_NAME = "connectionTimeout";
-
-    /** Configuration element attribute {@value} which holds the timeout used when reading from the SVN server. */
-    public static final String READ_TIMEOUT_ATTRIB_NAME = "readTimeout";
-
-    /** Configuration element attribute {@value} which holds the path to the working copy directory. */
-    public static final String WORKING_COPY_DIR_ATTRIB_NAME = "workingCopyDirectory";
-
-    /** Configuration element attribute {@value} which holds the path to the working copy directory. */
-    public static final String REVISION_ATTRIB_NAME = "revision";
-
-    /**
-     * Configuration element attribute {@value} which holds the path to the resource file represented by the SVN
-     * resource.
-     */
-    public static final String RESOURCE_FILE_ATTRIB_NAME = "resourceFile";
-
-    /** Configuration element attribute {@value} which holds the SVN username. */
-    public static final String USERNAME_ATTRIB_NAME = "username";
-
-    /** Configuration element attribute {@value} which holds the SVN password. */
-    public static final String PASSWORD_ATTRIB_NAME = "password";
-
-    /**
-     * Configuration element attribute {@value} which holds the hostname of the proxy server used when connecting to the
-     * SVN server.
-     */
-    public static final String PROXY_HOST_ATTRIB_NAME = "proxyHost";
-
-    /**
-     * Configuration element attribute {@value} which holds the port of the proxy server used when connecting to the SVN
-     * server.
-     */
-    public static final String PROXY_PORT_ATTRIB_NAME = "proxyPort";
-
-    /**
-     * Configuration element attribute {@value} which holds the username used with the proxy server used when connecting
-     * to the SVN server.
-     */
-    public static final String PROXY_USERNAME_ATTRIB_NAME = "proxyUsername";
-
-    /**
-     * Configuration element attribute {@value} which holds the password used with the proxy server used when connecting
-     * to the SVN server.
-     */
-    public static final String PROXY_PASSWORD_ATTRIB_NAME = "proxyPassword";
-
-    /** Default value of {@value #CTX_TIMEOUT_ATTRIB_NAME}, {@value} milliseconds. */
-    public static final int DEFAULT_CTX_TIMEOUT = 3000;
-
-    /** Default value of {@value #READ_TIMEOUT_ATTRIB_NAME}, {@value} milliseconds. */
-    public static final int DEFAULT_READ_TIMEOUT = 5000;
-
-    /** Default value of {@value #PROXY_PORT_ATTRIB_NAME}, {@value} . */
-    public static final int DEFAULT_PROXY_PORT = 8080;
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SVNResourceBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element arg0) {
-        return SVNResource.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDefinition, ParserContext parserContext) {
-        return SVNResource.class.getName() + ":"
-                + DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, REPOSITORY_URL_ATTRIB_NAME));
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder)
-            throws BeanCreationException {
-        super.doParse(configElement, parserContext, builder);
-
-        builder.addConstructorArgValue(buildClientManager(configElement));
-
-        builder.addConstructorArgValue(getRespositoryUrl(configElement));
-
-        builder.addConstructorArgValue(getWorkingCopyDirectory(configElement));
-
-        builder.addConstructorArgValue(getRevision(configElement));
-
-        builder.addConstructorArgValue(getResourceFile(configElement));
-
-        addResourceFilter(configElement, parserContext, builder);
-    }
-
-    /**
-     * Builds the SVN client manager from the given configuration options.
-     * 
-     * @param configElement element bearing the configuration options
-     * 
-     * @return the SVN client manager
-     */
-    protected SVNClientManager buildClientManager(Element configElement) {
-        ArrayList<SVNAuthentication> authnMethods = new ArrayList<SVNAuthentication>();
-        String username = getUsername(configElement);
-        if (username != null) {
-            authnMethods.add(new SVNUserNameAuthentication(username, false));
-
-            String password = getPassword(configElement);
-            if (password != null) {
-                authnMethods.add(new SVNPasswordAuthentication(username, password, false));
-            }
-        }
-
-        String proxyHost = getProxyHost(configElement);
-        int proxyPort = getProxyPort(configElement);
-        String proxyUser = getProxyUsername(configElement);
-        String proxyPassword = getPassword(configElement);
-
-        SVNBasicAuthenticationManager authnManager;
-        if (proxyHost == null) {
-            authnManager = new SVNBasicAuthenticationManager(authnMethods);
-        } else {
-            authnManager = new SVNBasicAuthenticationManager(authnMethods, proxyHost, proxyPort, proxyUser,
-                    proxyPassword);
-        }
-        authnManager.setConnectionTimeout(getConnectionTimeout(configElement));
-        authnManager.setReadTimeout(getReadTimeout(configElement));
-
-        SVNClientManager clientManager = SVNClientManager.newInstance();
-        clientManager.setAuthenticationManager(authnManager);
-        return clientManager;
-    }
-
-    /**
-     * Gets the value of the {@value #REPOSITORY_URL_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is missing or contains an invalid SVN URL
-     */
-    protected SVNURL getRespositoryUrl(Element configElement) throws BeanCreationException {
-        if (!configElement.hasAttributeNS(null, REPOSITORY_URL_ATTRIB_NAME)) {
-            log.error("SVN resource definition missing required '" + REPOSITORY_URL_ATTRIB_NAME + "' attribute");
-            throw new BeanCreationException("SVN resource definition missing required '" + REPOSITORY_URL_ATTRIB_NAME
-                    + "' attribute");
-        }
-
-        String repositoryUrl = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                REPOSITORY_URL_ATTRIB_NAME));
-        try {
-            return SVNURL.parseURIDecoded(repositoryUrl);
-        } catch (SVNException e) {
-            log.error("SVN remote repository URL " + repositoryUrl + " is not valid", e);
-            throw new BeanCreationException("SVN remote repository URL " + repositoryUrl + " is not valid", e);
-        }
-    }
-
-    /**
-     * Gets the value of the {@value #CTX_TIMEOUT_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute, or {@value #DEFAULT_CTX_TIMEOUT} if the attribute is not defined
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected int getConnectionTimeout(Element configElement) throws BeanCreationException {
-        if (!configElement.hasAttributeNS(null, CTX_TIMEOUT_ATTRIB_NAME)) {
-            return DEFAULT_CTX_TIMEOUT;
-        }
-
-        return (int) SpringConfigurationUtils.parseDurationToMillis(CTX_TIMEOUT_ATTRIB_NAME + " on SVN resource",
-                configElement.getAttributeNS(null, CTX_TIMEOUT_ATTRIB_NAME), 0);
-    }
-
-    /**
-     * Gets the value of the {@value #READ_TIMEOUT_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute, or {@value #DEFAULT_READ_TIMEOUT} if the attribute is not defined
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected int getReadTimeout(Element configElement) throws BeanCreationException {
-        if (!configElement.hasAttributeNS(null, READ_TIMEOUT_ATTRIB_NAME)) {
-            return DEFAULT_READ_TIMEOUT;
-        }
-
-        return (int) SpringConfigurationUtils.parseDurationToMillis(READ_TIMEOUT_ATTRIB_NAME + " on SVN resource",
-                configElement.getAttributeNS(null, CTX_TIMEOUT_ATTRIB_NAME), 0);
-    }
-
-    /**
-     * Gets the value of the {@value #REPOSITORY_URL_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is missing or contains an invalid directory path
-     */
-    protected File getWorkingCopyDirectory(Element configElement) throws BeanCreationException {
-        if (!configElement.hasAttributeNS(null, WORKING_COPY_DIR_ATTRIB_NAME)) {
-            log.error("SVN resource definition missing required '" + WORKING_COPY_DIR_ATTRIB_NAME + "' attribute");
-            throw new BeanCreationException("SVN resource definition missing required '" + WORKING_COPY_DIR_ATTRIB_NAME
-                    + "' attribute");
-        }
-
-        File directory = new File(DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                WORKING_COPY_DIR_ATTRIB_NAME)));
-        if (directory == null) {
-            log.error("SVN working copy directory may not be null");
-            throw new BeanCreationException("SVN working copy directory may not be null");
-        }
-
-        if (!directory.exists()) {
-            boolean created = directory.mkdirs();
-            if (!created) {
-                log.error("SVN working copy direction " + directory.getAbsolutePath()
-                        + " does not exist and could not be created");
-                throw new BeanCreationException("SVN working copy direction " + directory.getAbsolutePath()
-                        + " does not exist and could not be created");
-            }
-        }
-
-        if (!directory.isDirectory()) {
-            log.error("SVN working copy location " + directory.getAbsolutePath() + " is not a directory");
-            throw new BeanCreationException("SVN working copy location " + directory.getAbsolutePath()
-                    + " is not a directory");
-        }
-
-        if (!directory.canRead()) {
-            log.error("SVN working copy directory " + directory.getAbsolutePath() + " can not be read by this process");
-            throw new BeanCreationException("SVN working copy directory " + directory.getAbsolutePath()
-                    + " can not be read by this process");
-        }
-
-        if (!directory.canWrite()) {
-            log.error("SVN working copy directory " + directory.getAbsolutePath()
-                    + " can not be written to by this process");
-            throw new BeanCreationException("SVN working copy directory " + directory.getAbsolutePath()
-                    + " can not be written to by this process");
-        }
-
-        return directory;
-    }
-
-    /**
-     * Gets the value of the {@value #REVISION_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is missing or contains an invalid number
-     */
-    protected long getRevision(Element configElement) throws BeanCreationException {
-        if (!configElement.hasAttributeNS(null, REVISION_ATTRIB_NAME)) {
-            return -1;
-        } else {
-            try {
-                return Long.parseLong(DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                        WORKING_COPY_DIR_ATTRIB_NAME)));
-            } catch (NumberFormatException e) {
-                log
-                        .error("SVN resource definition attribute '" + REVISION_ATTRIB_NAME
-                                + "' contains an invalid number");
-                throw new BeanCreationException("SVN resource definition attribute '" + REVISION_ATTRIB_NAME
-                        + "' contains an invalid number");
-            }
-        }
-    }
-
-    /**
-     * Gets the value of the {@value #RESOURCE_FILE_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is missing or contains an empty string
-     */
-    protected String getResourceFile(Element configElement) throws BeanCreationException {
-        if (!configElement.hasAttributeNS(null, RESOURCE_FILE_ATTRIB_NAME)) {
-            log.error("SVN resource definition missing required '" + RESOURCE_FILE_ATTRIB_NAME + "' attribute");
-            throw new BeanCreationException("SVN resource definition missing required '" + RESOURCE_FILE_ATTRIB_NAME
-                    + "' attribute");
-        }
-
-        String filename = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                RESOURCE_FILE_ATTRIB_NAME));
-        if (filename == null) {
-            log.error("SVN resource definition attribute '" + RESOURCE_FILE_ATTRIB_NAME
-                    + "' may not be an empty string");
-            throw new BeanCreationException("SVN resource definition attribute '" + RESOURCE_FILE_ATTRIB_NAME
-                    + "' may not be an empty string");
-        }
-
-        return filename;
-    }
-
-    /**
-     * Gets the value of the {@value #USERNAME_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected String getUsername(Element configElement) throws BeanCreationException {
-        if (configElement.hasAttributeNS(null, USERNAME_ATTRIB_NAME)) {
-            String username = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                    USERNAME_ATTRIB_NAME));
-            if (username == null) {
-                log
-                        .error("SVN resource definition attribute '" + USERNAME_ATTRIB_NAME
-                                + "' may not be an empty string");
-                throw new BeanCreationException("SVN resource definition attribute '" + USERNAME_ATTRIB_NAME
-                        + "' may not be an empty string");
-            }
-            return username;
-        }
-
-        return null;
-    }
-
-    /**
-     * Gets the value of the {@value #PASSWORD_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected String getPassword(Element configElement) throws BeanCreationException {
-        if (configElement.hasAttributeNS(null, PASSWORD_ATTRIB_NAME)) {
-            String password = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                    PASSWORD_ATTRIB_NAME));
-            if (password == null) {
-                log
-                        .error("SVN resource definition attribute '" + PASSWORD_ATTRIB_NAME
-                                + "' may not be an empty string");
-                throw new BeanCreationException("SVN resource definition attribute '" + PASSWORD_ATTRIB_NAME
-                        + "' may not be an empty string");
-            }
-            return password;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the value of the {@value #PROXY_HOST_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected String getProxyHost(Element configElement) throws BeanCreationException {
-        if (configElement.hasAttributeNS(null, PROXY_HOST_ATTRIB_NAME)) {
-            String host = DatatypeHelper.safeTrimOrNullString(configElement
-                    .getAttributeNS(null, PROXY_HOST_ATTRIB_NAME));
-            if (host == null) {
-                log.error("SVN resource definition attribute '" + PROXY_HOST_ATTRIB_NAME
-                        + "' may not be an empty string");
-                throw new BeanCreationException("SVN resource definition attribute '" + PROXY_HOST_ATTRIB_NAME
-                        + "' may not be an empty string");
-            }
-            return host;
-        }
-
-        return null;
-    }
-
-    /**
-     * Gets the value of the {@value #PROXY_PORT_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute, or {@value #DEFAULT_PROXY_PORT} if the attribute is not defined
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected int getProxyPort(Element configElement) throws BeanCreationException {
-        if (!configElement.hasAttributeNS(null, PROXY_PORT_ATTRIB_NAME)) {
-            return DEFAULT_PROXY_PORT;
-        }
-
-        String port = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null, PROXY_PORT_ATTRIB_NAME));
-        if (port == null) {
-            log.error("SVN resource definition attribute '" + PROXY_PORT_ATTRIB_NAME + "' may not be an empty string");
-            throw new BeanCreationException("SVN resource definition attribute '" + PROXY_PORT_ATTRIB_NAME
-                    + "' may not be an empty string");
-        }
-
-        try {
-            return Integer.parseInt(port);
-        } catch (NumberFormatException e) {
-            log.error("SVN resource definition attribute '" + PROXY_PORT_ATTRIB_NAME + "' contains an invalid number");
-            throw new BeanCreationException("SVN resource definition attribute '" + PROXY_PORT_ATTRIB_NAME
-                    + "' contains an invalid number");
-        }
-    }
-
-    /**
-     * Gets the value of the {@value #PROXY_USERNAME_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected String getProxyUsername(Element configElement) throws BeanCreationException {
-        if (configElement.hasAttributeNS(null, PROXY_USERNAME_ATTRIB_NAME)) {
-            String username = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                    PROXY_USERNAME_ATTRIB_NAME));
-            if (username == null) {
-                log.error("SVN resource definition attribute '" + PROXY_USERNAME_ATTRIB_NAME
-                        + "' may not be an empty string");
-                throw new BeanCreationException("SVN resource definition attribute '" + PROXY_USERNAME_ATTRIB_NAME
-                        + "' may not be an empty string");
-            }
-            return username;
-        }
-        return null;
-    }
-
-    /**
-     * Gets the value of the {@value #PROXY_PASSWORD_ATTRIB_NAME} attribute.
-     * 
-     * @param configElement resource configuration element
-     * 
-     * @return value of the attribute
-     * 
-     * @throws BeanCreationException thrown if the attribute is present but contains an empty string
-     */
-    protected String getProxyPassword(Element configElement) throws BeanCreationException {
-        if (configElement.hasAttributeNS(null, PROXY_PASSWORD_ATTRIB_NAME)) {
-            String password = DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                    PROXY_PASSWORD_ATTRIB_NAME));
-            if (password == null) {
-                log.error("SVN resource definition attribute '" + PROXY_PASSWORD_ATTRIB_NAME
-                        + "' may not be an empty string");
-                throw new BeanCreationException("SVN resource definition attribute '" + PROXY_PASSWORD_ATTRIB_NAME
-                        + "' may not be an empty string");
-            }
-            return password;
-        }
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops
deleted file mode 100644
index 8ce88be..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops
+++ /dev/null
@@ -1,251 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 119
-/java-shib-common/!svn/ver/1053/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security
-END
-MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java
-END
-MetadataExplicitKeyTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataExplicitKeyTrustEngineFactoryBean.java
-END
-StaticExplicitKeyTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticExplicitKeyTrustEngineBeanDefinitionParser.java
-END
-InlinePKIXValidationInformationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 175
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlinePKIXValidationInformationBeanDefinitionParser.java
-END
-StaticExplicitKeyTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticExplicitKeyTrustEngineFactoryBean.java
-END
-StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 179
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java
-END
-StaticPKIXSignatureTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXSignatureTrustEngineBeanDefinitionParser.java
-END
-ShibbolethSecurityPolicyFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 159
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/ShibbolethSecurityPolicyFactoryBean.java
-END
-PKIXValidationInformationFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationInformationFactoryBean.java
-END
-StaticPKIXX509CredentialTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 170
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXX509CredentialTrustEngineFactoryBean.java
-END
-FilesystemPKIXValidationInformationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 179
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/FilesystemPKIXValidationInformationBeanDefinitionParser.java
-END
-X509CredentialFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 149
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/X509CredentialFactoryBean.java
-END
-MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 183
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java
-END
-ChainingTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/ChainingTrustEngineBeanDefinitionParser.java
-END
-ChainingTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 154
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/ChainingTrustEngineFactoryBean.java
-END
-InlineBasicCredentialBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlineBasicCredentialBeanDefinitionParser.java
-END
-StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java
-END
-BasicCredentialFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 150
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/BasicCredentialFactoryBean.java
-END
-StaticExplicitKeySignatureTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticExplicitKeySignatureTrustEngineFactoryBean.java
-END
-AbstractPKIXValidationInformationBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractPKIXValidationInformationBeanDefinitionParser.java
-END
-FilesystemBasicCredentialBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/FilesystemBasicCredentialBeanDefinitionParser.java
-END
-MetadataExplicitKeyTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataExplicitKeyTrustEngineBeanDefinitionParser.java
-END
-AbstractX509CredentialBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractX509CredentialBeanDefinitionParser.java
-END
-MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 176
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java
-END
-MetadataPKIXX509CredentialTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataPKIXX509CredentialTrustEngineFactoryBean.java
-END
-MetadataPKIXSignatureTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataPKIXSignatureTrustEngineFactoryBean.java
-END
-ChainingSignatureTrustEngineBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/ChainingSignatureTrustEngineBeanDefinitionParser.java
-END
-ShibbolethSecurityPolicyBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/ShibbolethSecurityPolicyBeanDefinitionParser.java
-END
-MandatoryMessageAuthenticationRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 178
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MandatoryMessageAuthenticationRuleBeanDefinitionParser.java
-END
-ChainingSignatureTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/ChainingSignatureTrustEngineFactoryBean.java
-END
-CertPathPKIXValidationOptionsBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/1053/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptionsBeanDefinitionParser.java
-END
-AbstractCredentialBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractCredentialBeanDefinitionParser.java
-END
-InlineX509CredentialBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/InlineX509CredentialBeanDefinitionParser.java
-END
-StaticPKIXSignatureTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXSignatureTrustEngineFactoryBean.java
-END
-AbstractBasicCredentialBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractBasicCredentialBeanDefinitionParser.java
-END
-AbstractCredentialFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/AbstractCredentialFactoryBean.java
-END
-PKIXValidationOptionsBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationOptionsBeanDefinitionParser.java
-END
-FilesystemX509CredentialBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/FilesystemX509CredentialBeanDefinitionParser.java
-END
-SecurityNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/SecurityNamespaceHandler.java
-END
-ClientCertAuthRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/ClientCertAuthRuleBeanDefinitionParser.java
-END
-MetadataExplicitKeySignatureTrustEngineFactoryBean.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/MetadataExplicitKeySignatureTrustEngineFactoryBean.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries
deleted file mode 100644
index 0888a65..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries
+++ /dev/null
@@ -1,1425 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-02-11T16:51:06.435201Z
-1053
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.826819Z
-1096aff3cf42cebd803d53d59aa3bbc1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3265
-

-MetadataExplicitKeyTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.826819Z
-786755839f4afd2e685e0fb660616f86
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2613
-

-MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.826819Z
-3749c2e8ee79e2becf3fc55290a90dfb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3240
-

-MetadataPKIXX509CredentialTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.826819Z
-819fccd62ede128d86346877b35b8bc6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3511
-

-ChainingSignatureTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-bb1006214054f0692bd5bafb33668c46
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4339
-

-ShibbolethSecurityPolicyBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-5720bf5dafe9f0a992881316ca1965bd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3101
-

-MandatoryMessageAuthenticationRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-da7a1330268a388ebbe3064ff539541a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1933
-

-InlinePKIXValidationInformationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-5a57ab64fdf8b83a5c917d6bc8b04772
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1599
-

-StaticExplicitKeyTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-04f4b5dc3366d8752ca410b51d235a38
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2297
-

-StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-40508aca04ff89f762c43b990b1b5d69
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3793
-

-ShibbolethSecurityPolicyFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-90ba225e568e0f0730b9d7c5a4d35bb1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2688
-

-AbstractCredentialBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-65654439643abed7a9d12bc5161f8724
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5893
-

-InlineX509CredentialBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-0d1a14b2c74e788bd568f2e563264d1f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1702
-

-FilesystemPKIXValidationInformationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.830819Z
-944abfc4fbe5d7cf20286115a87b0bcc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2338
-

-X509CredentialFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-8f7eb0b8ff23de302ed10ef0b6013212
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5871
-

-MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-8ad5e2b4e37ecd7161f0f577a12e51b1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2777
-

-FilesystemX509CredentialBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-3a05d719f9715a48ed3134e6eb9292af
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2752
-

-SecurityNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-973ce461054665dfb1f3633b4e4f72e2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5363
-

-ClientCertAuthRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-bef2141cd40dc923e5f206fc2dc82bbc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2732
-

-MetadataExplicitKeySignatureTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-f688e7074e7cd0af662e4588893767fc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3547
-

-ChainingTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-e79a5c3a6d9c4d35c793b3a2048b2a40
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4365
-

-InlineBasicCredentialBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-92136dff3c635abe1c821f3f7c6a3bb9
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1716
-

-StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.834819Z
-b2d7aee599df75a6898a2b6478c3efbb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3022
-

-AbstractPKIXValidationInformationBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-c0f8146e40f1779a16b490240011c27f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6298
-

-FilesystemBasicCredentialBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-17cffd9aa5795c16b1fcace815ca08cc
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2767
-

-MetadataPKIXSignatureTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-03aab491a66fea486863fb168a63eab6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4346
-

-StaticExplicitKeyTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-ac848067d81129dc0706ef485d8c6b66
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2977
-

-ChainingSignatureTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-51e3eeff9e122797a3f0a39b123f6684
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2244
-

-StaticPKIXSignatureTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-fabbe5d6e8a985957abbcf26a3c90685
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3768
-

-CertPathPKIXValidationOptionsBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-f4608c424e41a97482907a6474538b42
-2013-02-11T16:51:06.435201Z
-1053
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3701
-

-PKIXValidationInformationFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-ba592ea0f64b543eda1945ce543d7f87
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3616
-

-StaticPKIXX509CredentialTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-bad2aa1e9b8f5909cffa02dd00a2cafe
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4037
-

-StaticPKIXSignatureTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-63a2feda9ed2f5e47e89eff921af98a7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4860
-

-saml
-dir
-

-AbstractBasicCredentialBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-2976b15d778291dfbdfa3535b03d274f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5892
-

-AbstractCredentialFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-a88e05a70bab9503b0f80c74a2b934bb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2732
-

-PKIXValidationOptionsBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-910ef6caf64cb6cffaa0fb40741d0b7d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3244
-

-ChainingTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-9bfe7a43093bef1d64bcaa01e7ed7415
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2116
-

-BasicCredentialFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-7dbc497adc1e23e1e15d0a9886f3bb62
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4706
-

-StaticExplicitKeySignatureTrustEngineFactoryBean.java
-file
-
-
-
-
-2014-02-19T17:27:44.838819Z
-6e8013d2f3f82314fd6aadd87af9bf97
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3198
-

-MetadataExplicitKeyTrustEngineBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.826819Z
-54cea41760c50b0664cce83726f11f04
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2719
-

-AbstractX509CredentialBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.826819Z
-2e0e75725d4721e90fe2b91972d2b983
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6964
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractBasicCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractBasicCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractBasicCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractCredentialFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractCredentialFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractCredentialFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractPKIXValidationInformationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractPKIXValidationInformationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractPKIXValidationInformationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractX509CredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractX509CredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/AbstractX509CredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/BasicCredentialFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/BasicCredentialFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/BasicCredentialFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptionsBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptionsBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptionsBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingSignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingSignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingSignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingSignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingSignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingSignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ChainingTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ClientCertAuthRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ClientCertAuthRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ClientCertAuthRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemBasicCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemBasicCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemBasicCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemPKIXValidationInformationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemPKIXValidationInformationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemPKIXValidationInformationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemX509CredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemX509CredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/FilesystemX509CredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlineBasicCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlineBasicCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlineBasicCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlinePKIXValidationInformationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlinePKIXValidationInformationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlinePKIXValidationInformationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlineX509CredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlineX509CredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/InlineX509CredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MandatoryMessageAuthenticationRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MandatoryMessageAuthenticationRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MandatoryMessageAuthenticationRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeySignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeyTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeyTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataExplicitKeyTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXSignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXSignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXSignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXX509CredentialTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationInformationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationInformationFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationInformationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/SecurityNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/SecurityNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/SecurityNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ShibbolethSecurityPolicyBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ShibbolethSecurityPolicyBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ShibbolethSecurityPolicyBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ShibbolethSecurityPolicyFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ShibbolethSecurityPolicyFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/ShibbolethSecurityPolicyFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeySignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeyTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeyTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticExplicitKeyTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/X509CredentialFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/X509CredentialFactoryBean.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/X509CredentialFactoryBean.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractBasicCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractBasicCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 519e155..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractBasicCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.security.KeyException;
-import java.security.PublicKey;
-import java.util.List;
-import java.util.Map;
-
-import javax.crypto.SecretKey;
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.security.SecurityHelper;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base class for X509 credential beans.
- */
-public abstract class AbstractBasicCredentialBeanDefinitionParser extends AbstractCredentialBeanDefinitionParser {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractBasicCredentialBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return BasicCredentialFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return element.getAttributeNS(null, "id");
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} credential with id: {}", XMLHelper.getXSIType(element).getLocalPart(),
-                element.getAttributeNS(null, "id"));
-
-        parseAttributes(element, builder);
-
-        Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(element);
-
-        parseCommon(configChildren, builder);
-
-        parseSecretKey(configChildren, builder);
-        parsePrivateKey(configChildren, builder);
-        parsePublicKey(configChildren, builder);
-    }
-
-    /**
-     * Parses the secret key from the credential configuration.
-     * 
-     * @param configChildren children of the credential element
-     * @param builder credential build
-     */
-    protected void parseSecretKey(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        List<Element> keyElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "SecretKey"));
-        if (keyElems == null || keyElems.isEmpty()) {
-            return;
-        }
-
-        log.debug("Parsing credential secret key");
-        Element secretKeyElem = keyElems.get(0);
-        byte[] encodedKey = getEncodedSecretKey(DatatypeHelper.safeTrimOrNullString(secretKeyElem.getTextContent()));
-        String keyPassword = DatatypeHelper.safeTrimOrNullString(secretKeyElem.getAttributeNS(null, "password"));
-        try {
-            SecretKey key = SecurityHelper.decodeSecretKey(encodedKey, keyPassword.toCharArray());
-            builder.addPropertyValue("secretKey", key);
-        } catch (KeyException e) {
-            throw new FatalBeanException("Unable to create credential, unable to parse secret key", e);
-        }
-    }
-
-    /**
-     * Extracts the secret key bytes from the content of the SecretKey configuration element.
-     * 
-     * @param keyConfigContent content of the SecretKey configuration element
-     * 
-     * @return secret key bytes
-     */
-    protected abstract byte[] getEncodedSecretKey(String keyConfigContent);
-
-    /**
-     * Parses the public key from the credential configuration.
-     * 
-     * @param configChildren children of the credential element
-     * @param builder credential build
-     */
-    protected void parsePublicKey(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        List<Element> keyElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "PublicKey"));
-        if (keyElems == null || keyElems.isEmpty()) {
-            return;
-        }
-
-        log.debug("Parsing credential public key");
-        Element pubKeyElem = keyElems.get(0);
-        byte[] encodedKey = getEncodedPublicKey(DatatypeHelper.safeTrimOrNullString(pubKeyElem.getTextContent()));
-        String keyPassword = DatatypeHelper.safeTrimOrNullString(pubKeyElem.getAttributeNS(null, "password"));
-        char[] keyPasswordCharArray = null;
-        if (keyPassword != null) {
-            keyPasswordCharArray = keyPassword.toCharArray();
-        }
-        try {
-            PublicKey pubKey = SecurityHelper.decodePublicKey(encodedKey, keyPasswordCharArray);
-            builder.addPropertyValue("publicKey", pubKey);
-        } catch (KeyException e) {
-            throw new FatalBeanException("Unable to create credential, unable to parse public key", e);
-        }
-    }
-
-    /**
-     * Extracts the public key bytes from the content of the PublicKey configuration element.
-     * 
-     * @param keyConfigContent content of the PublicKey configuration element
-     * 
-     * @return private key bytes
-     */
-    protected abstract byte[] getEncodedPublicKey(String keyConfigContent);
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b7e33f7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.security.KeyException;
-import java.security.PrivateKey;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.security.SecurityHelper;
-import org.opensaml.xml.security.credential.UsageType;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-
-/**
- * Base class for credential beans.
- */
-public abstract class AbstractCredentialBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractCredentialBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return element.getAttributeNS(null, "id");
-    }
-    
-    /**
-     * Parse the credential element attributes.
-     * 
-     * @param element credential element
-     * @param builder bean definition builder
-     */
-    protected void parseAttributes(Element element, BeanDefinitionBuilder builder) {
-        String usage = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "usage"));
-        if (usage != null) {
-            builder.addPropertyValue("usageType", UsageType.valueOf(usage.toUpperCase()));
-        } else {
-            builder.addPropertyValue("usageType", UsageType.UNSPECIFIED);
-        }
-        
-        String entityID = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "entityID"));
-        if (entityID != null) {
-            builder.addPropertyValue("entityID", entityID);
-        }
-    }
-    
-    /**
-     * Parses the common elements from the credential configuration.
-     * 
-     * @param configChildren children of the credential element
-     * @param builder credential build
-     */
-    protected void parseCommon(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        parseKeyNames(configChildren, builder);
-    }
-
-    /**
-     * Parses the key names from the credential configuration.
-     * 
-     * @param configChildren children of the credential element
-     * @param builder credential build
-     */
-    protected void parseKeyNames(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        log.debug("Parsing credential key names");
-        List<Element> keyNameElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "KeyName"));
-        if (keyNameElems == null || keyNameElems.isEmpty()) {
-            return;
-        }
-
-        String keyName;
-        ArrayList<String> keyNames = new ArrayList<String>();
-        for (Element keyNameElem : keyNameElems) {
-            keyName = DatatypeHelper.safeTrimOrNullString(keyNameElem.getTextContent());
-            if (keyName != null) {
-                keyNames.add(keyName);
-            }
-        }
-
-        builder.addPropertyValue("keyNames", keyNames);
-    }
-    
-    /**
-     * Parses the private key from the credential configuration.
-     * 
-     * @param configChildren children of the credential element
-     * @param builder credential build
-     */
-    protected void parsePrivateKey(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {        
-        List<Element> keyElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "PrivateKey"));
-        if (keyElems == null || keyElems.isEmpty()) {
-            return;
-        }
-        
-        log.debug("Parsing credential private key");
-        Element privKeyElem = keyElems.get(0);
-        byte[] encodedKey = getEncodedPrivateKey(DatatypeHelper.safeTrimOrNullString(privKeyElem.getTextContent()));
-        String keyPassword = DatatypeHelper.safeTrimOrNullString(privKeyElem.getAttributeNS(null, "password"));
-        char[] keyPasswordCharArray = null;
-        if (keyPassword != null) {
-            keyPasswordCharArray = keyPassword.toCharArray();
-        }
-        try {
-            PrivateKey privKey = SecurityHelper.decodePrivateKey(encodedKey, keyPasswordCharArray);
-            builder.addPropertyValue("privateKey", privKey);
-        } catch (KeyException e) {
-            throw new FatalBeanException("Unable to create credential, unable to parse private key", e);
-        }
-    }
-
-    /**
-     * Extracts the private key bytes from the content of the PrivateKey configuration element.
-     * 
-     * @param keyConfigContent content of the Private configuration element
-     * 
-     * @return private key bytes
-     */
-    protected abstract byte[] getEncodedPrivateKey(String keyConfigContent);
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractCredentialFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractCredentialFactoryBean.java.svn-base
deleted file mode 100644
index 57c6eec..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractCredentialFactoryBean.java.svn-base
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import org.opensaml.xml.security.credential.UsageType;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Abstract factory bean for building {@link org.opensaml.xml.security.credential.Credential}s.
- */
-public abstract class AbstractCredentialFactoryBean extends AbstractFactoryBean {
-    
-    /** Usage type of the credential. */
-    private UsageType usageType;
-
-    /** Names for the key represented by the credential. */
-    private List<String> keyNames;
-    
-    /** Identifier for the owner of the credential. */
-    private String entityID;
-    
-    /**
-     * Gets the names for the key represented by the credential.
-     * 
-     * @return names for the key represented by the credential
-     */
-    public List<String> getKeyNames() {
-        return keyNames;
-    }
-
-    /**
-     * Gets the usage type of the credential.
-     * 
-     * @return usage type of the credential
-     */
-    public UsageType getUsageType(){
-        return usageType;
-    }
-    
-    /**
-     * Get the entity ID of the credential.
-     * 
-     * @return the entity ID
-     */
-    public String getEntityID() {
-        return entityID;
-    }
-
-    /**
-     * Sets the names for the key represented by the credential.
-     * 
-     * @param names names for the key represented by the credential
-     */
-    public void setKeyNames(List<String> names) {
-        keyNames = names;
-    }
-
-    /**
-     * Sets the usage type of the credential.
-     * 
-     * @param type usage type of the credential
-     */
-    public void setUsageType(UsageType type){
-        usageType = type;
-    }
-    
-    /**
-     * Set the entity ID of the credential.
-     * 
-     * @param newEntityID the entity ID
-     */
-    public void setEntityID(String newEntityID) {
-        entityID = newEntityID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractPKIXValidationInformationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractPKIXValidationInformationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a5a1e80..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractPKIXValidationInformationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.security.x509.X509Util;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base class for PKIXValidationInformation beans.
- */
-public abstract class AbstractPKIXValidationInformationBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractX509CredentialBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return PKIXValidationInformationFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return element.getAttributeNS(null, "id");
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        log.debug("Parsing PKIX ValidationInfo: {}", element.getAttributeNS(null, "id"));
-
-        int depth = 1;
-        if (element.hasAttributeNS(null, "verifyDepth")) {
-            depth = new Integer(DatatypeHelper.safeTrim(element.getAttributeNS(null, "verifyDepth")));
-        }
-        
-        builder.addPropertyValue("verifyDepth", depth);
-
-        Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(element);
-
-        parseCertificates(configChildren, builder);
-        parseCRLs(configChildren, builder);
-    }
-
-    /**
-     * Parses the certificates from the validation info configuration.
-     * 
-     * @param configChildren children of the validation set element
-     * @param builder validation set build
-     */
-    protected void parseCertificates(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        List<Element> certElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "Certificate"));
-        if (certElems == null || certElems.isEmpty()) {
-            return;
-        }
-
-        log.debug("Parsing PKIX validation info certificates");
-        ArrayList<X509Certificate> certs = new ArrayList<X509Certificate>();
-        byte[] encodedCert;
-        Collection<X509Certificate> decodedCerts;
-        for (Element certElem : certElems) {
-            encodedCert = getEncodedCertificate(DatatypeHelper.safeTrimOrNullString(certElem.getTextContent()));
-            if (encodedCert == null) {
-                continue;
-            }
-
-            try {
-                decodedCerts = X509Util.decodeCertificate(encodedCert);
-                certs.addAll(decodedCerts);
-            } catch (CertificateException e) {
-                throw new FatalBeanException("Unable to create PKIX validation info, unable to parse certificates", e);
-            }
-        }
-
-        builder.addPropertyValue("certificates", certs);
-    }
-
-    /**
-     * Extracts the certificate bytes from the content of a Certificate configuration element.
-     * 
-     * @param certConfigContent content of a Certificate configuration element
-     * 
-     * @return certificate bytes
-     */
-    protected abstract byte[] getEncodedCertificate(String certConfigContent);
-
-    /**
-     * Parses the CRLs from the validation info configuration.
-     * 
-     * @param configChildren children of the validation info element
-     * @param builder validation info build
-     */
-    protected void parseCRLs(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        List<Element> crlElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "CRL"));
-        if (crlElems == null || crlElems.isEmpty()) {
-            return;
-        }
-
-        log.debug("Parsing PKIX validation info CRLs");
-        ArrayList<X509CRL> crls = new ArrayList<X509CRL>();
-        byte[] encodedCRL;
-        Collection<X509CRL> decodedCRLs;
-        for (Element crlElem : crlElems) {
-            encodedCRL = getEncodedCRL(DatatypeHelper.safeTrimOrNullString(crlElem.getTextContent()));
-            if (encodedCRL == null) {
-                continue;
-            }
-
-            try {
-                decodedCRLs = X509Util.decodeCRLs(encodedCRL);
-                crls.addAll(decodedCRLs);
-            } catch (CRLException e) {
-                throw new FatalBeanException("Unable to create PKIX validation info, unable to parse CRLs", e);
-            }
-        }
-
-        builder.addPropertyValue("crls", crls);
-    }
-
-    /**
-     * Extracts the CRL(s) bytes from the content of a CRL configuration element.
-     * 
-     * @param certCRLContent content of a CRL configuration element
-     * 
-     * @return CRL bytes
-     */
-    protected abstract byte[] getEncodedCRL(String certCRLContent);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractX509CredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractX509CredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 211a5ce..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/AbstractX509CredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.security.x509.X509Util;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-/**
- * Base class for X509 credential beans.
- */
-public abstract class AbstractX509CredentialBeanDefinitionParser extends AbstractCredentialBeanDefinitionParser {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractX509CredentialBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return X509CredentialFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return element.getAttributeNS(null, "id");
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} credential with id: {}", XMLHelper.getXSIType(element)
-                .getLocalPart(), element.getAttributeNS(null, "id"));
-
-        parseAttributes(element, builder);
-
-        Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(element);
-
-        parseCommon(configChildren, builder);
-
-        parsePrivateKey(configChildren, builder);
-        parseCertificates(configChildren, builder);
-        parseCRLs(configChildren, builder);
-    }
-
-    /**
-     * Parses the certificates from the credential configuration.
-     * 
-     * @param configChildren children of the credential element
-     * @param builder credential build
-     */
-    protected void parseCertificates(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        List<Element> certElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "Certificate"));
-        if (certElems == null || certElems.isEmpty()) {
-            return;
-        }
-
-        log.debug("Parsing x509 credential certificates");
-        ArrayList<X509Certificate> certs = new ArrayList<X509Certificate>();
-        byte[] encodedCert;
-        Collection<X509Certificate> decodedCerts;
-        for (Element certElem : certElems) {
-            encodedCert = getEncodedCertificate(DatatypeHelper.safeTrimOrNullString(certElem.getTextContent()));
-            if (encodedCert == null) {
-                continue;
-            }
-
-            boolean isEntityCert = false;
-            Attr entityCertAttr = certElem.getAttributeNodeNS(null, "entityCertificate");
-            if (entityCertAttr != null) {
-                isEntityCert = XMLHelper.getAttributeValueAsBoolean(entityCertAttr);
-            }
-            if (isEntityCert) {
-                log.debug("Element config flag found indicating entity certificate");
-            }
-
-            try {
-                decodedCerts = X509Util.decodeCertificate(encodedCert);
-                certs.addAll(decodedCerts);
-                if (isEntityCert) {
-                    if (decodedCerts.size() == 1) {
-                        builder.addPropertyValue("entityCertificate", decodedCerts.iterator().next());
-                    } else {
-                        throw new FatalBeanException(
-                                "Config element indicated an entityCertificate, but multiple certs where decoded");
-                    }
-                }
-            } catch (CertificateException e) {
-                throw new FatalBeanException("Unable to create X509 credential, unable to parse certificates", e);
-            }
-        }
-
-        builder.addPropertyValue("certificates", certs);
-    }
-
-    /**
-     * Extracts the certificate bytes from the content of a Certificate configuration element.
-     * 
-     * @param certConfigContent content of a Certificate configuration element
-     * 
-     * @return certificate bytes
-     */
-    protected abstract byte[] getEncodedCertificate(String certConfigContent);
-
-    /**
-     * Parses the CRLs from the credential configuration.
-     * 
-     * @param configChildren children of the credential element
-     * @param builder credential build
-     */
-    protected void parseCRLs(Map<QName, List<Element>> configChildren, BeanDefinitionBuilder builder) {
-        List<Element> crlElems = configChildren.get(new QName(SecurityNamespaceHandler.NAMESPACE, "CRL"));
-        if (crlElems == null || crlElems.isEmpty()) {
-            return;
-        }
-
-        log.debug("Parsing x509 credential CRLs");
-        ArrayList<X509CRL> crls = new ArrayList<X509CRL>();
-        byte[] encodedCRL;
-        Collection<X509CRL> decodedCRLs;
-        for (Element crlElem : crlElems) {
-            encodedCRL = getEncodedCRL(DatatypeHelper.safeTrimOrNullString(crlElem.getTextContent()));
-            if (encodedCRL == null) {
-                continue;
-            }
-
-            try {
-                decodedCRLs = X509Util.decodeCRLs(encodedCRL);
-                crls.addAll(decodedCRLs);
-            } catch (CRLException e) {
-                throw new FatalBeanException("Unable to create X509 credential, unable to parse CRLs", e);
-            }
-        }
-
-        builder.addPropertyValue("crls", crls);
-    }
-
-    /**
-     * Extracts the CRL(s) bytes from the content of a CRL configuration element.
-     * 
-     * @param certCRLContent content of a CRL configuration element
-     * 
-     * @return CRL bytes
-     */
-    protected abstract byte[] getEncodedCRL(String certCRLContent);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/BasicCredentialFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/BasicCredentialFactoryBean.java.svn-base
deleted file mode 100644
index cbca7a7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/BasicCredentialFactoryBean.java.svn-base
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-import javax.crypto.SecretKey;
-
-import org.opensaml.xml.security.SecurityException;
-import org.opensaml.xml.security.SecurityHelper;
-import org.opensaml.xml.security.credential.BasicCredential;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Factory bean for building {@link java.security.cert.X509Certificate}s.
- */
-public class BasicCredentialFactoryBean extends AbstractCredentialFactoryBean {
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(BasicCredentialFactoryBean.class);
-
-    /** Secret key respresented by this credential. */
-    private SecretKey secretKey;
-
-    /** Private key respresented by this credential. */
-    private PrivateKey privateKey;
-
-    /** Public key respresented by this credential. */
-    private PublicKey publicKey;
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        BasicCredential credential = new BasicCredential();
-        
-        credential.setUsageType(getUsageType());
-        
-        credential.setEntityId(getEntityID());
-        
-        if(getKeyNames() != null){
-            credential.getKeyNames().addAll(getKeyNames());
-        }
-
-        credential.setSecretKey(secretKey);
-        credential.setPrivateKey(privateKey);
-        if (publicKey != null) {
-            credential.setPublicKey(publicKey);
-        } else if (privateKey != null) {
-            credential.setPublicKey(SecurityHelper.derivePublicKey(privateKey));
-        }
-        
-        // Sanity check that public and private key match
-        if (credential.getPublicKey() != null && credential.getPrivateKey() != null) {
-            boolean matched = false;
-            try {
-                matched = SecurityHelper.matchKeyPair(credential.getPublicKey(), credential.getPrivateKey());
-            } catch (SecurityException e) {
-                log.warn("Could not perform sanity check against credential public and private key: {}",
-                        e.getMessage());
-            }
-            if (!matched) {
-                log.error("Mismatch detected between credential's public and private key");
-                throw new SecurityException("Mismatch between credential public and private key");
-            }
-        }
-        
-        return credential;
-    }
-    
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return BasicCredential.class;
-    }
-    
-    /**
-     * Gets the private key respresented by this credential.
-     * 
-     * @return private key respresented by this credential
-     */
-    public PrivateKey getPrivateKey() {
-        return privateKey;
-    }
-
-    /**
-     * Gets the public key respresented by this credential.
-     * 
-     * @return public key respresented by this credential
-     */
-    public PublicKey getPublicKey() {
-        return publicKey;
-    }
-
-    /**
-     * Gets the secret key respresented by this credential.
-     * 
-     * @return secret key respresented by this credential
-     */
-    public SecretKey getSecretKey() {
-        return secretKey;
-    }
-    
-    /**
-     * Sets the private key respresented by this credential.
-     * 
-     * @param key private key respresented by this credential
-     */
-    public void setPrivateKey(PrivateKey key) {
-        privateKey = key;
-    }
-
-    /**
-     * Sets the public key respresented by this credential.
-     * 
-     * @param key public key respresented by this credential
-     */
-    public void setPublicKey(PublicKey key) {
-        publicKey = key;
-    }
-
-    /**
-     * Sets the secret key respresented by this credential.
-     * 
-     * @param key secret key respresented by this credential
-     */
-    public void setSecretKey(SecretKey key) {
-        secretKey = key;
-    }
- 
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptionsBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptionsBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 62f0105..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptionsBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.HashSet;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.security.x509.CertPathPKIXValidationOptions;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}ValidationOptions elements
- * which have a type specialization of {urn:mace:shibboleth:2.0:security}CertPathValidationOptionsType. */
-public class CertPathPKIXValidationOptionsBeanDefinitionParser extends PKIXValidationOptionsBeanDefinitionParser {
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE =
-            new QName(SecurityNamespaceHandler.NAMESPACE, "CertPathValidationOptionsType");
-    
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return CertPathPKIXValidationOptions.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        super.doParse(element, builder);
-        
-        if (element.hasAttributeNS(null, "forceRevocationEnabled")) {
-            Attr attr = element.getAttributeNodeNS(null, "forceRevocationEnabled");
-            builder.addPropertyValue("forceRevocationEnabled", XMLHelper.getAttributeValueAsBoolean(attr));
-        }
-        
-        if (element.hasAttributeNS(null, "revocationEnabled")) {
-            Attr attr = element.getAttributeNodeNS(null, "revocationEnabled");
-            builder.addPropertyValue("revocationEnabled", XMLHelper.getAttributeValueAsBoolean(attr));
-        }
-        
-        if (element.hasAttributeNS(null, "policyMappingInhibit")) {
-            Attr attr = element.getAttributeNodeNS(null, "policyMappingInhibit");
-            builder.addPropertyValue("policyMappingInhibit", XMLHelper.getAttributeValueAsBoolean(attr));
-        }
-        
-        if (element.hasAttributeNS(null, "anyPolicyInhibit")) {
-            Attr attr = element.getAttributeNodeNS(null, "anyPolicyInhibit");
-            builder.addPropertyValue("anyPolicyInhibit", XMLHelper.getAttributeValueAsBoolean(attr));
-        }
-
-        List<Element>childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE,
-                "PolicyOID");
-        HashSet<String> initialPolicies = new HashSet<String>(childElems.size());
-        for (Element nameElem : childElems) {
-            initialPolicies.add(DatatypeHelper.safeTrimOrNullString(nameElem.getTextContent()));
-        }
-        builder.addPropertyValue("initialPolicies", initialPolicies);
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingSignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingSignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 210175c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingSignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}Chaining elements. */
-public class ChainingSignatureTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "SignatureChaining");
-
-    /** TrustEngine element name. */
-    private static final QName TRUST_ENGINE_NAME = new QName(SecurityNamespaceHandler.NAMESPACE, "TrustEngine");
-
-    /** TrustEngineRef element name. */
-    private static final QName TRUST_ENGINE_REF_NAME = new QName(SecurityNamespaceHandler.NAMESPACE, "TrustEngineRef");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ChainingSignatureTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ChainingSignatureTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element).getLocalPart(),
-                element.getAttributeNS(null, "id"));
-
-        ManagedList managedChain = new ManagedList();
-
-        Element child = XMLHelper.getFirstChildElement(element);
-        while (child != null) {
-            QName childName = XMLHelper.getNodeQName(child);
-            if (TRUST_ENGINE_NAME.equals(childName)) {
-                log.debug("Parsing chain trust engine member {}", element.getAttributeNS(null, "id"));
-                managedChain.add(SpringConfigurationUtils.parseCustomElement(child, parserContext));
-            } else if (TRUST_ENGINE_REF_NAME.equals(childName)) {
-                log.debug("Parsing chain trust engine member reference {}", element.getAttributeNS(null, "ref"));
-                managedChain.add(SpringConfigurationUtils.parseCustomElementReference(child, "ref", parserContext));
-            } else {
-                log.error("Unsupported child element of chaining trust engine '{}' encountered with name: {}", element
-                        .getAttributeNS(null, "id"), childName);
-                throw new FatalBeanException("Unsupported child element of chaining trust engine encountered");
-            }
-
-            child = XMLHelper.getNextSiblingElement(child);
-        }
-
-        builder.addPropertyValue("chain", managedChain);
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingSignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingSignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index 0722c17..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingSignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import org.opensaml.xml.security.trust.ChainingTrustEngine;
-import org.opensaml.xml.signature.SignatureTrustEngine;
-import org.opensaml.xml.signature.impl.ChainingSignatureTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to created {@link ChainingSignatureTrustEngine}s.
- */
-public class ChainingSignatureTrustEngineFactoryBean extends AbstractFactoryBean {
-
-    /** List of chain members. */
-    private List<SignatureTrustEngine> chain;
-
-    /**
-     * Gets the chain member list.
-     * 
-     * @return chain member list
-     */
-    public List<SignatureTrustEngine> getChain() {
-        return chain;
-    }
-
-    /**
-     * Sets the chain member list.
-     * 
-     * @param newChain the new chain member list
-     */
-    public void setChain(List<SignatureTrustEngine> newChain) {
-        chain = newChain;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ChainingTrustEngine.class;
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    protected Object createInstance() throws Exception {
-        ChainingSignatureTrustEngine engine = new ChainingSignatureTrustEngine();
-        if (chain != null) {
-            engine.getChain().addAll(chain);
-        }
-        return engine;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 19d0fe1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}Chaining elements. */
-public class ChainingTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "Chaining");
-    
-    /** TrustEngine element name. */
-    private static final QName TRUST_ENGINE_NAME = new QName(SecurityNamespaceHandler.NAMESPACE, "TrustEngine");
-    
-    /** TrustEngineRef element name. */
-    private static final QName TRUST_ENGINE_REF_NAME = new QName(SecurityNamespaceHandler.NAMESPACE, "TrustEngineRef");
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ChainingTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ChainingTrustEngineFactoryBean.class;
-    }
-    
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element)
-                .getLocalPart(), element.getAttributeNS(null, "id"));
-        
-        ManagedList managedChain = new ManagedList();
-        
-        Element child = XMLHelper.getFirstChildElement(element);
-        while (child != null) {
-            QName childName = XMLHelper.getNodeQName(child);
-            if (TRUST_ENGINE_NAME.equals(childName)) {
-                log.debug("Parsing chain trust engine member {}", element.getAttributeNS(null, "id"));
-                managedChain.add(SpringConfigurationUtils.parseCustomElement(child, parserContext));
-            } else if (TRUST_ENGINE_REF_NAME.equals(childName)) {
-                log.debug("Parsing chain trust engine member reference {}", element.getAttributeNS(null, "ref") );
-                managedChain.add(SpringConfigurationUtils.parseCustomElementReference(child, "ref", parserContext));
-            } else {
-                log.error("Unsupported child element of chaining trust engine '{}' encountered with name: {}", 
-                        element.getAttributeNS(null, "id"), childName);
-                throw new FatalBeanException("Unsupported child element of chaining trust engine encountered");
-            }
-            
-            child = XMLHelper.getNextSiblingElement(child);
-        }
-        
-        builder.addPropertyValue("chain", managedChain);
-    }
-    
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index 19bb684..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ChainingTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import org.opensaml.xml.security.trust.ChainingTrustEngine;
-import org.opensaml.xml.security.trust.TrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to created {@link ChainingTrustEngine}s.
- */
-public class ChainingTrustEngineFactoryBean extends AbstractFactoryBean {
-    
-    /** List of chain members. */
-    private List<TrustEngine> chain;
-
-    /**
-     * Gets the chain member list.
-     * 
-     * @return chain member list
-     */
-    public List<TrustEngine> getChain() {
-        return chain;
-    }
-
-    /**
-     * Sets the chain member list.
-     * 
-     * @param newChain the new chain member list
-     */
-    public void setChain(List<TrustEngine> newChain) {
-        chain = newChain;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ChainingTrustEngine.class;
-    }
-    
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    protected Object createInstance() throws Exception {
-        ChainingTrustEngine engine = new ChainingTrustEngine();
-        if (chain != null) {
-            engine.getChain().addAll(chain);
-        }
-        return engine;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ClientCertAuthRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ClientCertAuthRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 06886a0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ClientCertAuthRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.ws.security.provider.CertificateNameOptions;
-import org.opensaml.xml.security.x509.X500DNHandler;
-import org.opensaml.xml.security.x509.X509Util;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.binding.security.ShibbolethClientCertAuthRule;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}ClientCertificate elements. */
-public class ClientCertAuthRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "ClientCertAuth");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ShibbolethClientCertAuthRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgReference(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "trustEngineRef")));
-        
-        CertificateNameOptions nameOptions = new CertificateNameOptions();
-        nameOptions.setX500SubjectDNFormat(X500DNHandler.FORMAT_RFC2253);
-        nameOptions.setEvaluateSubjectDN(false);
-        nameOptions.setEvaluateSubjectCommonName(true);
-        nameOptions.getSubjectAltNames().add(X509Util.DNS_ALT_NAME);
-        nameOptions.getSubjectAltNames().add(X509Util.URI_ALT_NAME);
-        
-        builder.addConstructorArgValue(nameOptions);
-    }
-    
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemBasicCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemBasicCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 2a5ee00..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemBasicCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.FatalBeanException;
-
-/**
- * Spring bean definition parser for filesytem-based credential configuration elements.
- */
-public class FilesystemBasicCredentialBeanDefinitionParser extends AbstractBasicCredentialBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "BasicFilesystem");
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedPrivateKey(String keyConfigContent) {
-        try {
-            FileInputStream ins = new FileInputStream(keyConfigContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read private key from file " + keyConfigContent, e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedSecretKey(String keyConfigContent) {
-        try {
-            FileInputStream ins = new FileInputStream(keyConfigContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read secret key from file " + keyConfigContent, e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedPublicKey(String keyConfigContent) {
-        try {
-            FileInputStream ins = new FileInputStream(keyConfigContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read public key from file " + keyConfigContent, e);
-        }
-    }
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemPKIXValidationInformationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemPKIXValidationInformationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 3042105..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemPKIXValidationInformationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.FatalBeanException;
-
-/**
- * Spring bean definition parser for filesytem-based PKIX validation info configuration elements.
- */
-public class FilesystemPKIXValidationInformationBeanDefinitionParser 
-    extends AbstractPKIXValidationInformationBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "PKIXFilesystem");
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCRL(String certCRLContent) {
-        try {
-            FileInputStream ins = new FileInputStream(certCRLContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read CRL(s) from file " + certCRLContent, e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCertificate(String certConfigContent) {
-        try {
-            FileInputStream ins = new FileInputStream(certConfigContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read certificate(s) from file " + certConfigContent, e);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemX509CredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemX509CredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index b829b8a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/FilesystemX509CredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import javax.xml.namespace.QName;
-
-import org.springframework.beans.FatalBeanException;
-
-/**
- * Spring bean definition parser for filesytem-based credential configuration elements.
- */
-public class FilesystemX509CredentialBeanDefinitionParser extends AbstractX509CredentialBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "X509Filesystem");
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCRL(String certCRLContent) {
-        try {
-            FileInputStream ins = new FileInputStream(certCRLContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read CRL(s) from file " + certCRLContent, e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCertificate(String certConfigContent) {
-        try {
-            FileInputStream ins = new FileInputStream(certConfigContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read certificate(s) from file " + certConfigContent, e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedPrivateKey(String keyConfigContent) {
-        try {
-            FileInputStream ins = new FileInputStream(keyConfigContent);
-            byte[] encoded = new byte[ins.available()];
-            ins.read(encoded);
-            return encoded;
-        } catch (IOException e) {
-            throw new FatalBeanException("Unable to read private key from file " + keyConfigContent, e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlineBasicCredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlineBasicCredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ad18679..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlineBasicCredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-/**
- * Spring bean definition parser for inline credential configuration elements.
- */
-public class InlineBasicCredentialBeanDefinitionParser extends AbstractBasicCredentialBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "BasicInline");
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedPublicKey(String keyConfigContent) {
-        return keyConfigContent.getBytes();
-    }
-    
-    /** {@inheritDoc} */
-    protected byte[] getEncodedPrivateKey(String keyConfigContent) {
-        return keyConfigContent.getBytes();
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedSecretKey(String keyConfigContent) {
-        return keyConfigContent.getBytes();
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlinePKIXValidationInformationBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlinePKIXValidationInformationBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 0a80ff3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlinePKIXValidationInformationBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-/**
- * Spring bean definition parser for inline PKIX validation info configuration elements.
- */
-public class InlinePKIXValidationInformationBeanDefinitionParser 
-    extends AbstractPKIXValidationInformationBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "PKIXInline");
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCRL(String certCRLContent) {
-        return certCRLContent.getBytes();
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCertificate(String certConfigContent) {
-        return certConfigContent.getBytes();
-    }
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlineX509CredentialBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlineX509CredentialBeanDefinitionParser.java.svn-base
deleted file mode 100644
index f00f31e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/InlineX509CredentialBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-/**
- * Spring bean definition parser for inline credential configuration elements.
- */
-public class InlineX509CredentialBeanDefinitionParser extends AbstractX509CredentialBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "X509Inline");
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCRL(String certCRLContent) {
-        return certCRLContent.getBytes();
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedCertificate(String certConfigContent) {
-        return certConfigContent.getBytes();
-    }
-
-    /** {@inheritDoc} */
-    protected byte[] getEncodedPrivateKey(String keyConfigContent) {
-        return keyConfigContent.getBytes();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MandatoryMessageAuthenticationRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MandatoryMessageAuthenticationRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 29d39ed..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MandatoryMessageAuthenticationRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.ws.security.provider.MandatoryAuthenticatedMessageRule;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition for {@link MandatoryAuthenticatedMessageRule}s.
- */
-public class MandatoryMessageAuthenticationRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE,
-            "MandatoryMessageAuthentication");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MandatoryAuthenticatedMessageRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        // do nothing
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 65b11b5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}MetadataExplicitKeySignature elements. */
-public class MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE,
-            "MetadataExplicitKeySignature");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory
-            .getLogger(MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MetadataExplicitKeySignatureTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element)
-                .getLocalPart(), element.getAttributeNS(null, "id"));
-
-        builder.addPropertyReference("metadataProvider", DatatypeHelper.safeTrim(element.getAttributeNS(null,
-                "metadataProviderRef")));
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeySignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index bb289ef..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.security.MetadataCredentialResolver;
-import org.opensaml.security.MetadataCredentialResolverFactory;
-import org.opensaml.xml.security.keyinfo.BasicProviderKeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoProvider;
-import org.opensaml.xml.security.keyinfo.provider.DSAKeyValueProvider;
-import org.opensaml.xml.security.keyinfo.provider.InlineX509DataProvider;
-import org.opensaml.xml.security.keyinfo.provider.RSAKeyValueProvider;
-import org.opensaml.xml.signature.impl.ExplicitKeySignatureTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to created {@link ExplicitKeySignatureTrustEngine}s based on a metadata provider.
- */
-public class MetadataExplicitKeySignatureTrustEngineFactoryBean extends AbstractFactoryBean {
-    
-    /** Metadata provider used to look up key information for peer entities. */
-    private MetadataProvider metadataProvider;
-
-    /**
-     * Gets the metadata provider used to look up key information for peer entities.
-     * 
-     * @return metadata provider used to look up key information for peer entities
-     */
-    public MetadataProvider getMetadataProvider() {
-        return metadataProvider;
-    }
-
-    /**
-     * Sets the metadata provider used to look up key information for peer entities.
-     * 
-     * @param provider metadata provider used to look up key information for peer entities
-     */
-    public void setMetadataProvider(MetadataProvider provider) {
-        metadataProvider = provider;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ExplicitKeySignatureTrustEngine.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        MetadataCredentialResolverFactory mcrFactory = MetadataCredentialResolverFactory.getFactory();
-        MetadataCredentialResolver credResolver = mcrFactory.getInstance(getMetadataProvider());
-        
-        List<KeyInfoProvider> keyInfoProviders = new ArrayList<KeyInfoProvider>();
-        keyInfoProviders.add(new DSAKeyValueProvider());
-        keyInfoProviders.add(new RSAKeyValueProvider());
-        keyInfoProviders.add(new InlineX509DataProvider());
-        KeyInfoCredentialResolver keyInfoCredResolver = new BasicProviderKeyInfoCredentialResolver(keyInfoProviders);
-        
-        return new ExplicitKeySignatureTrustEngine(credResolver, keyInfoCredResolver);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 4234452..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}MetadataExplicitKey elements. */
-public class MetadataExplicitKeyTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "MetadataExplicitKey");
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(MetadataExplicitKeyTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MetadataExplicitKeyTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element)
-                .getLocalPart(), element.getAttributeNS(null, "id"));
-        
-        builder.addPropertyReference("metadataProvider", DatatypeHelper.safeTrim(element.getAttributeNS(null,
-                "metadataProviderRef")));
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeyTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeyTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index 7e5f858..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataExplicitKeyTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.security.MetadataCredentialResolver;
-import org.opensaml.security.MetadataCredentialResolverFactory;
-import org.opensaml.xml.security.trust.ExplicitKeyTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to created {@link ExplicitKeyTrustEngine}s based on a metadata provider.
- */
-public class MetadataExplicitKeyTrustEngineFactoryBean extends AbstractFactoryBean {
-    
-    /** Metadata provider used to look up key information for peer entities. */
-    private MetadataProvider metadataProvider;
-
-    /**
-     * Gets the metadata provider used to look up key information for peer entities.
-     * 
-     * @return metadata provider used to look up key information for peer entities
-     */
-    public MetadataProvider getMetadataProvider() {
-        return metadataProvider;
-    }
-
-    /**
-     * Sets the metadata provider used to look up key information for peer entities.
-     * 
-     * @param provider metadata provider used to look up key information for peer entities
-     */
-    public void setMetadataProvider(MetadataProvider provider) {
-        metadataProvider = provider;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ExplicitKeyTrustEngine.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        MetadataCredentialResolverFactory mcrFactory = MetadataCredentialResolverFactory.getFactory();
-        MetadataCredentialResolver credResolver = mcrFactory.getInstance(getMetadataProvider());
-        return new ExplicitKeyTrustEngine(credResolver);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 79beb3f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}MetadataPKIXSignature elements. */
-public class MetadataPKIXSignatureTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "MetadataPKIXSignature");
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(MetadataPKIXSignatureTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MetadataPKIXSignatureTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element)
-                .getLocalPart(), element.getAttributeNS(null, "id"));
-        
-        builder.addPropertyReference("metadataProvider", DatatypeHelper.safeTrim(element.getAttributeNS(null,
-                "metadataProviderRef")));
-        
-        List<Element> childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE, "ValidationOptions");
-        if (childElems.size() > 0) {
-            builder.addPropertyValue("PKIXValidationOptions", SpringConfigurationUtils.parseInnerCustomElement(
-                    (Element) childElems.get(0), parserContext));
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXSignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXSignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index 7927f84..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXSignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.xml.security.keyinfo.BasicProviderKeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoProvider;
-import org.opensaml.xml.security.keyinfo.provider.DSAKeyValueProvider;
-import org.opensaml.xml.security.keyinfo.provider.InlineX509DataProvider;
-import org.opensaml.xml.security.keyinfo.provider.RSAKeyValueProvider;
-import org.opensaml.xml.security.x509.CertPathPKIXTrustEvaluator;
-import org.opensaml.xml.security.x509.PKIXValidationOptions;
-import org.opensaml.xml.signature.impl.PKIXSignatureTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import edu.internet2.middleware.shibboleth.common.security.MetadataPKIXValidationInformationResolver;
-
-/**
- * Spring factory bean used to created {@link PKIXSignatureTrustEngine}s based on a metadata provider.
- */
-public class MetadataPKIXSignatureTrustEngineFactoryBean extends AbstractFactoryBean {
-
-    /** Metadata provider used to look up PKIX information for peer entities. */
-    private MetadataProvider metadataProvider;
-    
-    /** PKIX validation options. */
-    private PKIXValidationOptions pkixOptions;
-    
-    /**
-     * Get the PKIX validation options.
-     * 
-     * @return the set of validation options
-     */
-    public PKIXValidationOptions getPKIXValidationOptions() {
-        return pkixOptions;
-    }
-
-    /**
-     * Set the PKIX validation options.
-     * 
-     * @param newOptions the new set of validation options
-     */
-    public void setPKIXValidationOptions(PKIXValidationOptions newOptions) {
-        pkixOptions = newOptions;
-    }
-
-    /**
-     * Gets the metadata provider used to look up PKIX information for peer entities.
-     * 
-     * @return metadata provider used to look up PKIX information for peer entities
-     */
-    public MetadataProvider getMetadataProvider() {
-        return metadataProvider;
-    }
-
-    /**
-     * Sets the metadata provider used to look up PKIX information for peer entities.
-     * 
-     * @param provider metadata provider used to look up PKIX information for peer entities
-     */
-    public void setMetadataProvider(MetadataProvider provider) {
-        metadataProvider = provider;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PKIXSignatureTrustEngine.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        MetadataPKIXValidationInformationResolver pviResolver = new MetadataPKIXValidationInformationResolver(
-                getMetadataProvider());
-
-        List<KeyInfoProvider> keyInfoProviders = new ArrayList<KeyInfoProvider>();
-        keyInfoProviders.add(new DSAKeyValueProvider());
-        keyInfoProviders.add(new RSAKeyValueProvider());
-        keyInfoProviders.add(new InlineX509DataProvider());
-        KeyInfoCredentialResolver keyInfoCredResolver = new BasicProviderKeyInfoCredentialResolver(keyInfoProviders);
-
-        PKIXSignatureTrustEngine engine = new PKIXSignatureTrustEngine(pviResolver, keyInfoCredResolver);
-        
-        if (getPKIXValidationOptions() != null) {
-            ((CertPathPKIXTrustEvaluator)engine.getPKIXTrustEvaluator()).setPKIXValidationOptions(getPKIXValidationOptions());
-        }
-        
-        return engine;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 02bbdfa..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}MetadataPKIXX509Credential elements. */
-public class MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "MetadataPKIXX509Credential");
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MetadataPKIXX509CredentialTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element)
-                .getLocalPart(), element.getAttributeNS(null, "id"));
-        
-        builder.addPropertyReference("metadataProvider", DatatypeHelper.safeTrim(element.getAttributeNS(null,
-                "metadataProviderRef")));
-        
-        List<Element> childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE, "ValidationOptions");
-        if (childElems.size() > 0) {
-            builder.addPropertyValue("PKIXValidationOptions", SpringConfigurationUtils.parseInnerCustomElement(
-                    (Element) childElems.get(0), parserContext));
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXX509CredentialTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index fb994e5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.xml.security.x509.CertPathPKIXTrustEvaluator;
-import org.opensaml.xml.security.x509.PKIXValidationOptions;
-import org.opensaml.xml.security.x509.PKIXX509CredentialTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import edu.internet2.middleware.shibboleth.common.security.MetadataPKIXValidationInformationResolver;
-
-/**
- * Spring factory bean used to created {@link PKIXX509CredentialTrustEngine}s based on a metadata provider.
- */
-public class MetadataPKIXX509CredentialTrustEngineFactoryBean extends AbstractFactoryBean {
-
-    /** Metadata provider used to look up key information for peer entities. */
-    private MetadataProvider metadataProvider;
-    
-    
-    /** PKIX validation options. */
-    private PKIXValidationOptions pkixOptions;
-    
-    /**
-     * Get the PKIX validation options.
-     * 
-     * @return the set of validation options
-     */
-    public PKIXValidationOptions getPKIXValidationOptions() {
-        return pkixOptions;
-    }
-
-    /**
-     * Set the PKIX validation options.
-     * 
-     * @param newOptions the new set of validation options
-     */
-    public void setPKIXValidationOptions(PKIXValidationOptions newOptions) {
-        pkixOptions = newOptions;
-    }
-
-    /**
-     * Gets the metadata provider used to look up key information for peer entities.
-     * 
-     * @return metadata provider used to look up key information for peer entities
-     */
-    public MetadataProvider getMetadataProvider() {
-        return metadataProvider;
-    }
-
-    /**
-     * Sets the metadata provider used to look up key information for peer entities.
-     * 
-     * @param provider metadata provider used to look up key information for peer entities
-     */
-    public void setMetadataProvider(MetadataProvider provider) {
-        metadataProvider = provider;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PKIXX509CredentialTrustEngine.class;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        MetadataPKIXValidationInformationResolver pviResolver = new MetadataPKIXValidationInformationResolver(
-                getMetadataProvider());
-        
-        PKIXX509CredentialTrustEngine engine = new PKIXX509CredentialTrustEngine(pviResolver);
-        
-        if (getPKIXValidationOptions() != null) {
-            ((CertPathPKIXTrustEvaluator)engine.getPKIXTrustEvaluator()).setPKIXValidationOptions(getPKIXValidationOptions());
-        }
-        
-        return engine;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationInformationFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationInformationFactoryBean.java.svn-base
deleted file mode 100644
index bcb2bc9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationInformationFactoryBean.java.svn-base
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.xml.security.x509.BasicPKIXValidationInformation;
-import org.opensaml.xml.security.x509.PKIXValidationInformation;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Factory bean for building instances of {@link PKIXValidationInformation}.
- */
-public class PKIXValidationInformationFactoryBean extends AbstractFactoryBean {
-
-    /** Certificates respresented by this info set. */
-    private List<X509Certificate> certificates;
-
-    /** CRL respresented by this info set. */
-    private List<X509CRL> x509crls;
-    
-    /** Max verify depth represented by this info set. */
-    private Integer verifyDepth;
-    
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        List<X509Certificate> certs = new ArrayList<X509Certificate>();
-        if (getCertificates() != null) {
-            certs.addAll(getCertificates());
-        }
-        List<X509CRL> crls = new ArrayList<X509CRL>();
-        if (getCrls() != null) {
-            crls.addAll(getCrls());
-        }
-        
-        return new BasicPKIXValidationInformation(certs, crls, getVerifyDepth());
-    }
-    
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PKIXValidationInformation.class;
-    }
-
-    /**
-     * Gets the cerificates respresented by this info set.
-     * 
-     * @return cerificates respresented by this info set
-     */
-    public List<X509Certificate> getCertificates() {
-        return certificates;
-    }
-    
-    /**
-     * Gets the CRLs respresented by this info set.
-     * 
-     * @return CRLs respresented by this info set
-     */
-    public List<X509CRL> getCrls() {
-        return x509crls;
-    }
-    
-    /**
-     * Get the max verify depth represented by this info set.
-     * 
-     * @return the max verify depth
-     */
-    public Integer getVerifyDepth() {
-        return verifyDepth;
-    }
-
-    /**
-     * Sets the cerificates respresented by this info set.
-     * 
-     * @param certs cerificates respresented by this info set
-     */
-    public void setCertificates(List<X509Certificate> certs) {
-        certificates = certs;
-    }
-
-    /**
-     * Sets the CRLs respresented by this info set.
-     * 
-     * @param crls CRLs respresented by this info set
-     */
-    public void setCrls(List<X509CRL> crls) {
-        this.x509crls = crls;
-    }
-
-    /**
-     * Set the max verify depth represented by this info set.
-     * 
-     * @param newDepth the new max verify depth
-     */
-    public void setVerifyDepth(Integer newDepth) {
-        verifyDepth = newDepth;
-    }
- 
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsBeanDefinitionParser.java.svn-base
deleted file mode 100644
index ba3534d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.security.x509.PKIXValidationOptions;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}PKIXValidationOptions elements. */
-public class PKIXValidationOptionsBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-    
-    /** Element name. */
-    public static final QName ELEMENT_NAME = new QName(SecurityNamespaceHandler.NAMESPACE, "ValidationOptions");
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "ValidationOptionsType");
-    
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return PKIXValidationOptions.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        if (element.hasAttributeNS(null, "processEmptyCRLs")) {
-            Attr attr = element.getAttributeNodeNS(null, "processEmptyCRLs");
-            builder.addPropertyValue("processEmptyCRLs", XMLHelper.getAttributeValueAsBoolean(attr));
-        }
-        
-        if (element.hasAttributeNS(null, "processExpiredCRLs")) {
-            Attr attr = element.getAttributeNodeNS(null, "processExpiredCRLs");
-            builder.addPropertyValue("processExpiredCRLs", XMLHelper.getAttributeValueAsBoolean(attr));
-        }
-        
-        if (element.hasAttributeNS(null, "processCredentialCRLs")) {
-            Attr attr = element.getAttributeNodeNS(null, "processCredentialCRLs");
-            builder.addPropertyValue("processCredentialCRLs", XMLHelper.getAttributeValueAsBoolean(attr));
-        }
-        
-        if (element.hasAttributeNS(null, "defaultVerificationDepth")) {
-            Integer depth = new Integer(DatatypeHelper.safeTrim(element.getAttributeNS(null, "defaultVerificationDepth")));
-            builder.addPropertyValue("defaultVerificationDepth", depth);
-        }
-        
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/SecurityNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/SecurityNamespaceHandler.java.svn-base
deleted file mode 100644
index b52a308..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/SecurityNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for Shibboleth security objects.
- */
-public class SecurityNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Security configuration namespace. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:security";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(FilesystemX509CredentialBeanDefinitionParser.SCHEMA_TYPE,
-                new FilesystemX509CredentialBeanDefinitionParser());
-
-        registerBeanDefinitionParser(InlineX509CredentialBeanDefinitionParser.SCHEMA_TYPE,
-                new InlineX509CredentialBeanDefinitionParser());
-
-        registerBeanDefinitionParser(FilesystemBasicCredentialBeanDefinitionParser.SCHEMA_TYPE,
-                new FilesystemBasicCredentialBeanDefinitionParser());
-
-        registerBeanDefinitionParser(InlineBasicCredentialBeanDefinitionParser.SCHEMA_TYPE,
-                new InlineBasicCredentialBeanDefinitionParser());
-
-        registerBeanDefinitionParser(FilesystemPKIXValidationInformationBeanDefinitionParser.SCHEMA_TYPE,
-                new FilesystemPKIXValidationInformationBeanDefinitionParser());
-
-        registerBeanDefinitionParser(InlinePKIXValidationInformationBeanDefinitionParser.SCHEMA_TYPE,
-                new InlinePKIXValidationInformationBeanDefinitionParser());
-        
-        BeanDefinitionParser pkixOptionsParser = new PKIXValidationOptionsBeanDefinitionParser();
-        registerBeanDefinitionParser(PKIXValidationOptionsBeanDefinitionParser.ELEMENT_NAME, pkixOptionsParser);
-        registerBeanDefinitionParser(PKIXValidationOptionsBeanDefinitionParser.SCHEMA_TYPE, pkixOptionsParser);
-        
-        registerBeanDefinitionParser(CertPathPKIXValidationOptionsBeanDefinitionParser.SCHEMA_TYPE,
-                new CertPathPKIXValidationOptionsBeanDefinitionParser());
-
-        BeanDefinitionParser parser = new ShibbolethSecurityPolicyBeanDefinitionParser();
-        registerBeanDefinitionParser(ShibbolethSecurityPolicyBeanDefinitionParser.ELEMENT_NAME, parser);
-        registerBeanDefinitionParser(ShibbolethSecurityPolicyBeanDefinitionParser.SCHEMA_TYPE, parser);
-
-        registerBeanDefinitionParser(ChainingTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new ChainingTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(ChainingSignatureTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new ChainingSignatureTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MetadataExplicitKeyTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new MetadataExplicitKeyTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new MetadataPKIXX509CredentialTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new MetadataExplicitKeySignatureTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MetadataPKIXSignatureTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new MetadataPKIXSignatureTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(StaticExplicitKeyTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new StaticExplicitKeyTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new StaticExplicitKeySignatureTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new StaticPKIXX509CredentialTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(StaticPKIXSignatureTrustEngineBeanDefinitionParser.SCHEMA_TYPE,
-                new StaticPKIXSignatureTrustEngineBeanDefinitionParser());
-
-        registerBeanDefinitionParser(ClientCertAuthRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new ClientCertAuthRuleBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MandatoryMessageAuthenticationRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new MandatoryMessageAuthenticationRuleBeanDefinitionParser());
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ShibbolethSecurityPolicyBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ShibbolethSecurityPolicyBeanDefinitionParser.java.svn-base
deleted file mode 100644
index f6fd899..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ShibbolethSecurityPolicyBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring configuration parser for shibboleth security policies.
- */
-public class ShibbolethSecurityPolicyBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Default element name. */
-    public static final QName ELEMENT_NAME = new QName(SecurityNamespaceHandler.NAMESPACE, "SecurityPolicy");
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "SecurityPolicyType");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethSecurityPolicyBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ShibbolethSecurityPolicyFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return element.getAttributeNS(null, "id");
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} security policy with id: {}", XMLHelper.getXSIType(element)
-                .getLocalPart(), element.getAttributeNS(null, "id"));
-
-        String policyId = element.getAttributeNS(null, "id");
-        log.debug("Configuring security policy: {}", policyId);
-        builder.addPropertyValue("policyId", policyId);
-
-        builder.addPropertyValue("policyRules", SpringConfigurationUtils.parseInnerCustomElements(XMLHelper
-                .getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE, "Rule"), parserContext));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ShibbolethSecurityPolicyFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ShibbolethSecurityPolicyFactoryBean.java.svn-base
deleted file mode 100644
index 9267a54..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/ShibbolethSecurityPolicyFactoryBean.java.svn-base
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.ArrayList;
-
-import org.opensaml.ws.security.SecurityPolicyRule;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import edu.internet2.middleware.shibboleth.common.security.ShibbolethSecurityPolicy;
-
-/**
- * Spring factory bean for producing {@link ShibbolethSecurityPolicy}s.
- */
-public class ShibbolethSecurityPolicyFactoryBean extends AbstractFactoryBean {
-
-    /** Unique ID of the policy. */
-    private String policyId;
-
-    /** Rules that make up the policy. */
-    private ArrayList<SecurityPolicyRule> policyRules;
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ShibbolethSecurityPolicy.class;
-    }
-
-    /**
-     * Gets the unique ID of the policy.
-     * 
-     * @return unique ID of the policy
-     */
-    public String getPolicyId() {
-        return policyId;
-    }
-
-    /**
-     * Sets the unique ID of the policy.
-     * 
-     * @param id unique ID of the policy
-     */
-    public void setPolicyId(String id) {
-        policyId = id;
-    }
-
-    /**
-     * Gets the rules that make up the policy.
-     * 
-     * @return rules that make up the policy
-     */
-    public ArrayList<SecurityPolicyRule> getPolicyRules() {
-        return policyRules;
-    }
-
-    /**
-     * Sets the rules that make up the policy.
-     * 
-     * @param rules rules that make up the policy
-     */
-    public void setPolicyRules(ArrayList<SecurityPolicyRule> rules) {
-        policyRules = rules;
-    }
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        ShibbolethSecurityPolicy policy = new ShibbolethSecurityPolicy(getPolicyId());
-        if (getPolicyRules() != null) {
-            policy.getPolicyRules().addAll(getPolicyRules());
-        }
-
-        return policy;
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 59a7005..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}StaticExplicitKeySignature elements. */
-public class StaticExplicitKeySignatureTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "StaticExplicitKeySignature");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StaticExplicitKeySignatureTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return StaticExplicitKeySignatureTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element).getLocalPart(),
-                element.getAttributeNS(null, "id"));
-
-        List<Element> childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE,
-                "Credential");
-        builder.addPropertyValue("credentials", SpringConfigurationUtils
-                        .parseCustomElements(childElems, parserContext));
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeySignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index 9a20b3a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeySignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.xml.security.credential.Credential;
-import org.opensaml.xml.security.credential.StaticCredentialResolver;
-import org.opensaml.xml.security.keyinfo.BasicProviderKeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoProvider;
-import org.opensaml.xml.security.keyinfo.provider.DSAKeyValueProvider;
-import org.opensaml.xml.security.keyinfo.provider.InlineX509DataProvider;
-import org.opensaml.xml.security.keyinfo.provider.RSAKeyValueProvider;
-import org.opensaml.xml.signature.impl.ExplicitKeySignatureTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to created {@link ExplicitKeySignatureTrustEngine}s based on a static credential resolver.
- */
-public class StaticExplicitKeySignatureTrustEngineFactoryBean extends AbstractFactoryBean {
-    
-    /** List of trusted credentials. */
-    private List<Credential> credentials;
-
-    /**
-     * Gets the list of trusted credentials.
-     * 
-     * @return the list of trusted credentials
-     */
-    public List<Credential> getCredentials() {
-        return credentials;
-    }
-
-    /**
-     * Sets the list of trusted credentials.
-     * 
-     * @param newCredentials the new list of trusted credentials
-     */
-    public void setCredentials(List<Credential> newCredentials) {
-        credentials = newCredentials;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ExplicitKeySignatureTrustEngine.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        StaticCredentialResolver credResolver = new StaticCredentialResolver(getCredentials());
-        
-        List<KeyInfoProvider> keyInfoProviders = new ArrayList<KeyInfoProvider>();
-        keyInfoProviders.add(new DSAKeyValueProvider());
-        keyInfoProviders.add(new RSAKeyValueProvider());
-        keyInfoProviders.add(new InlineX509DataProvider());
-        KeyInfoCredentialResolver keyInfoCredResolver = new BasicProviderKeyInfoCredentialResolver(keyInfoProviders);
-        
-        return new ExplicitKeySignatureTrustEngine(credResolver, keyInfoCredResolver);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 8668dca..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeyTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}StaticExplicitKey elements. */
-public class StaticExplicitKeyTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "StaticExplicitKey");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StaticExplicitKeyTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return StaticExplicitKeyTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element).getLocalPart(),
-                element.getAttributeNS(null, "id"));
-
-        List<Element> childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE,
-                "Credential");
-        builder.addPropertyValue("credentials", SpringConfigurationUtils
-                        .parseCustomElements(childElems, parserContext));
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeyTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeyTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index 34a77c0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticExplicitKeyTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.List;
-
-import org.opensaml.xml.security.credential.Credential;
-import org.opensaml.xml.security.credential.StaticCredentialResolver;
-import org.opensaml.xml.security.trust.ExplicitKeyTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to created {@link ExplicitKeyTrustEngine}s based on a static credential resolver.
- */
-public class StaticExplicitKeyTrustEngineFactoryBean extends AbstractFactoryBean {
-    
-    /** List of trusted credentials. */
-    private List<Credential> credentials;
-
-    /**
-     * Gets the list of trusted credentials.
-     * 
-     * @return the list of trusted credentials
-     */
-    public List<Credential> getCredentials() {
-        return credentials;
-    }
-
-    /**
-     * Sets the list of trusted credentials.
-     * 
-     * @param newCredentials the new list of trusted credentials
-     */
-    public void setCredentials(List<Credential> newCredentials) {
-        credentials = newCredentials;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return ExplicitKeyTrustEngine.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        StaticCredentialResolver credResolver = new StaticCredentialResolver(getCredentials());
-        
-        return new ExplicitKeyTrustEngine(credResolver);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 413232e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.HashSet;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}StaticPKIXSignature elements. */
-public class StaticPKIXSignatureTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "StaticPKIXSignature");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StaticPKIXSignatureTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return StaticPKIXSignatureTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element).getLocalPart(),
-                element.getAttributeNS(null, "id"));
-
-        List<Element> childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE,
-                "ValidationInfo");
-        builder.addPropertyValue("PKIXInfo", SpringConfigurationUtils.parseInnerCustomElements(childElems, parserContext));
-
-        childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE, "TrustedName");
-        HashSet<String> trustedNames = new HashSet<String>(childElems.size());
-        for (Element nameElem : childElems) {
-            trustedNames.add(DatatypeHelper.safeTrimOrNullString(nameElem.getTextContent()));
-        }
-        builder.addPropertyValue("trustedNames", trustedNames);
-        
-        childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE, "ValidationOptions");
-        if (childElems.size() > 0) {
-            builder.addPropertyValue("PKIXValidationOptions", SpringConfigurationUtils.parseInnerCustomElement(
-                    (Element) childElems.get(0), parserContext));
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index 78524fe..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.opensaml.xml.security.keyinfo.BasicProviderKeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoProvider;
-import org.opensaml.xml.security.keyinfo.provider.DSAKeyValueProvider;
-import org.opensaml.xml.security.keyinfo.provider.InlineX509DataProvider;
-import org.opensaml.xml.security.keyinfo.provider.RSAKeyValueProvider;
-import org.opensaml.xml.security.x509.CertPathPKIXTrustEvaluator;
-import org.opensaml.xml.security.x509.PKIXValidationInformation;
-import org.opensaml.xml.security.x509.PKIXValidationOptions;
-import org.opensaml.xml.security.x509.StaticPKIXValidationInformationResolver;
-import org.opensaml.xml.signature.impl.PKIXSignatureTrustEngine;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to create {@link PKIXSignatureTrustEngine}s based on a static 
- * PKIXValidationInformation resolver.
- */
-public class StaticPKIXSignatureTrustEngineFactoryBean extends AbstractFactoryBean {
-    
-    /** List of PKIX validation info. */
-    private List<PKIXValidationInformation> pkixInfo;
-    
-    /** Set of trusted names. */
-    private Set<String> trustedNames;
-    
-    /** PKIX validation options. */
-    private PKIXValidationOptions pkixOptions;
-    
-    /**
-     * Get the PKIX validation options.
-     * 
-     * @return the set of validation options
-     */
-    public PKIXValidationOptions getPKIXValidationOptions() {
-        return pkixOptions;
-    }
-
-    /**
-     * Set the PKIX validation options.
-     * 
-     * @param newOptions the new set of validation options
-     */
-    public void setPKIXValidationOptions(PKIXValidationOptions newOptions) {
-        pkixOptions = newOptions;
-    }
-
-    /**
-     * Gets the list of PKIX validation info.
-     * 
-     * @return the list of PKIX validation info 
-     */
-    public List<PKIXValidationInformation> getPKIXInfo() {
-        return pkixInfo;
-    }
-
-    /**
-     * Sets the list of PKIX validation info.
-     * 
-     * @param newPKIXInfo the new list of PKIX validation info
-     */
-    public void setPKIXInfo(List<PKIXValidationInformation> newPKIXInfo) {
-        pkixInfo = newPKIXInfo;
-    }
-
-    /**
-     * Gets the set of trusted names.
-     * 
-     * @return the set of trusted names
-     */
-    public Set<String> getTrustedNames() {
-        return trustedNames;
-    }
-
-    /**
-     * Sets the set of trusted names.
-     * 
-     * @param newTrustedNames the set of trusted names
-     */
-    public void setTrustedNames(Set<String> newTrustedNames) {
-        trustedNames = newTrustedNames;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PKIXSignatureTrustEngine.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        Set<String> names = getTrustedNames();
-        if (names == null) {
-            names = Collections.emptySet();
-        }
-        StaticPKIXValidationInformationResolver pkixResolver = 
-            new StaticPKIXValidationInformationResolver(getPKIXInfo(), names);
-        
-        List<KeyInfoProvider> keyInfoProviders = new ArrayList<KeyInfoProvider>();
-        keyInfoProviders.add(new DSAKeyValueProvider());
-        keyInfoProviders.add(new RSAKeyValueProvider());
-        keyInfoProviders.add(new InlineX509DataProvider());
-        KeyInfoCredentialResolver keyInfoCredResolver = new BasicProviderKeyInfoCredentialResolver(keyInfoProviders);
-        
-        PKIXSignatureTrustEngine engine = new PKIXSignatureTrustEngine(pkixResolver, keyInfoCredResolver);
-        
-        if (getPKIXValidationOptions() != null) {
-            ((CertPathPKIXTrustEvaluator)engine.getPKIXTrustEvaluator()).setPKIXValidationOptions(getPKIXValidationOptions());
-        }
-        
-        return engine;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
deleted file mode 100644
index a89726f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.HashSet;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security}StaticPKIXX509Credential elements. */
-public class StaticPKIXX509CredentialTrustEngineBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SecurityNamespaceHandler.NAMESPACE, "StaticPKIXX509Credential");
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(StaticPKIXX509CredentialTrustEngineBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return StaticPKIXX509CredentialTrustEngineFactoryBean.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        log.info("Parsing configuration for {} trust engine with id: {}", XMLHelper.getXSIType(element).getLocalPart(),
-                element.getAttributeNS(null, "id"));
-
-        List<Element> childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE,
-                "ValidationInfo");
-        builder.addPropertyValue("PKIXInfo", SpringConfigurationUtils.parseInnerCustomElements(childElems, parserContext));
-
-        childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE, "TrustedName");
-        HashSet<String> trustedNames = new HashSet<String>(childElems.size());
-        for (Element nameElem : childElems) {
-            trustedNames.add(DatatypeHelper.safeTrimOrNullString(nameElem.getTextContent()));
-        }
-        builder.addPropertyValue("trustedNames", trustedNames);
-        
-        childElems = XMLHelper.getChildElementsByTagNameNS(element, SecurityNamespaceHandler.NAMESPACE, "ValidationOptions");
-        if (childElems.size() > 0) {
-            builder.addPropertyValue("PKIXValidationOptions", SpringConfigurationUtils.parseInnerCustomElement(
-                    (Element) childElems.get(0), parserContext));
-        }
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
-        return DatatypeHelper.safeTrim(element.getAttributeNS(null, "id"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
deleted file mode 100644
index fa67fa9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineFactoryBean.java.svn-base
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.opensaml.xml.security.x509.CertPathPKIXTrustEvaluator;
-import org.opensaml.xml.security.x509.PKIXValidationInformation;
-import org.opensaml.xml.security.x509.PKIXValidationOptions;
-import org.opensaml.xml.security.x509.PKIXX509CredentialTrustEngine;
-import org.opensaml.xml.security.x509.StaticPKIXValidationInformationResolver;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-/**
- * Spring factory bean used to create {@link PKIXX509CredentialTrustEngine}s based on a static 
- * PKIXValidationInformation resolver.
- */
-public class StaticPKIXX509CredentialTrustEngineFactoryBean extends AbstractFactoryBean {
-    
-    /** List of PKIX validation info. */
-    private List<PKIXValidationInformation> pkixInfo;
-    
-    /** Set of trusted names. */
-    private Set<String> trustedNames;
-    
-    /** PKIX validation options. */
-    private PKIXValidationOptions pkixOptions;
-    
-    /**
-     * Get the PKIX validation options.
-     * 
-     * @return the set of validation options
-     */
-    public PKIXValidationOptions getPKIXValidationOptions() {
-        return pkixOptions;
-    }
-
-    /**
-     * Set the PKIX validation options.
-     * 
-     * @param newOptions the new set of validation options
-     */
-    public void setPKIXValidationOptions(PKIXValidationOptions newOptions) {
-        pkixOptions = newOptions;
-    }
-
-    /**
-     * Gets the list of PKIX validation info.
-     * 
-     * @return the list of PKIX validation info 
-     */
-    public List<PKIXValidationInformation> getPKIXInfo() {
-        return pkixInfo;
-    }
-
-    /**
-     * Sets the list of PKIX validation info.
-     * 
-     * @param newPKIXInfo the new list of PKIX validation info
-     */
-    public void setPKIXInfo(List<PKIXValidationInformation> newPKIXInfo) {
-        pkixInfo = newPKIXInfo;
-    }
-    
-    /**
-     * Gets the set of trusted names.
-     * 
-     * @return the set of trusted names
-     */
-    public Set<String> getTrustedNames() {
-        return trustedNames;
-    }
-
-    /**
-     * Sets the set of trusted names.
-     * 
-     * @param newTrustedNames the set of trusted names
-     */
-    public void setTrustedNames(Set<String> newTrustedNames) {
-        trustedNames = newTrustedNames;
-    }
-
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return PKIXX509CredentialTrustEngine.class;
-    }
-    
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        Set<String> names = getTrustedNames();
-        if (names == null) {
-            names = Collections.emptySet();
-        }
-        StaticPKIXValidationInformationResolver pkixResolver = 
-            new StaticPKIXValidationInformationResolver(getPKIXInfo(), names);
-        
-        PKIXX509CredentialTrustEngine engine = new PKIXX509CredentialTrustEngine(pkixResolver);
-        
-        if (getPKIXValidationOptions() != null) {
-            ((CertPathPKIXTrustEvaluator)engine.getPKIXTrustEvaluator()).setPKIXValidationOptions(getPKIXValidationOptions());
-        }
-        
-        return engine;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/X509CredentialFactoryBean.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/X509CredentialFactoryBean.java.svn-base
deleted file mode 100644
index 3c6309a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/X509CredentialFactoryBean.java.svn-base
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.security.PrivateKey;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.xml.security.SecurityException;
-import org.opensaml.xml.security.SecurityHelper;
-import org.opensaml.xml.security.x509.BasicX509Credential;
-import org.opensaml.xml.security.x509.X509Credential;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Factory bean for building {@link X509Credential}s.
- */
-public class X509CredentialFactoryBean extends AbstractCredentialFactoryBean {
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(X509CredentialFactoryBean.class);
-
-    /** Private key respresented by this credential. */
-    private PrivateKey privateKey;
-    
-    /** The end-entity certificate. */
-    private X509Certificate entityCertificate;
-
-    /** Certificate respresented by this credential. */
-    private List<X509Certificate> certificates;
-
-    /** CRL respresented by this credential. */
-    private List<X509CRL> x509crls;
-
-    /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
-        BasicX509Credential credential = new BasicX509Credential();
-        
-        credential.setUsageType(getUsageType());
-        
-        credential.setEntityId(getEntityID());
-        
-        if(getKeyNames() != null){
-            credential.getKeyNames().addAll(getKeyNames());
-        }
-        
-        if(certificates != null){
-            credential.setEntityCertificateChain(new ArrayList<X509Certificate>(certificates));
-            if (entityCertificate != null) {
-                credential.setEntityCertificate(entityCertificate);
-            } else {
-                credential.setEntityCertificate(certificates.get(0));
-            }
-        }
-        
-        if(x509crls != null){
-            credential.setCRLs(new ArrayList<X509CRL>(x509crls));
-        }
-        
-        credential.setPrivateKey(privateKey);
-        //TODO may adjust BasicX509Credential to make this unnecessary
-        credential.setPublicKey(credential.getEntityCertificate().getPublicKey());
-        
-        // Sanity check that public and private key match
-        if (credential.getPublicKey() != null && credential.getPrivateKey() != null) {
-            boolean matched = false;
-            try {
-                matched = SecurityHelper.matchKeyPair(credential.getPublicKey(), credential.getPrivateKey());
-            } catch (SecurityException e) {
-                log.warn("Could not perform sanity check against credential public and private key: {}",
-                        e.getMessage());
-            }
-            if (!matched) {
-                log.error("Mismatch detected between credential's public and private key");
-                throw new SecurityException("Mismatch between credential public and private key");
-            }
-        } 
-        
-        return credential;
-    }
-    
-    /** {@inheritDoc} */
-    public Class getObjectType() {
-        return X509Credential.class;
-    }
-
-    /**
-     * Gets the end-entity cerificate respresented by this credential.
-     * 
-     * @return entity certificate respresented by this credential
-     */
-    public X509Certificate getEntityCertificate() {
-        return entityCertificate;
-    }
-    
-    /**
-     * Gets the cerificates respresented by this credential.
-     * 
-     * @return cerificates respresented by this credential
-     */
-    public List<X509Certificate> getCertificates() {
-        return certificates;
-    }
-    
-    /**
-     * Gets the CRLs respresented by this credential.
-     * 
-     * @return CRLs respresented by this credential
-     */
-    public List<X509CRL> getCrls() {
-        return x509crls;
-    }
-
-
-    /**
-     * Gets the private key respresented by this credential.
-     * 
-     * @return private key respresented by this credential
-     */
-    public PrivateKey getPrivateKey() {
-        return privateKey;
-    }
-
-    /**
-     * Sets the end-entity cerificate respresented by this credential.
-     * 
-     * @param newCert the new entity certificate respresented by this credential
-     */
-    public void setEntityCertificate(X509Certificate newCert) {
-        entityCertificate = newCert;
-    }
-    
-    /**
-     * Sets the cerificates respresented by this credential.
-     * 
-     * @param certs cerificates respresented by this credential
-     */
-    public void setCertificates(List<X509Certificate> certs) {
-        certificates = certs;
-    }
-
-    /**
-     * Sets the CRLs respresented by this credential.
-     * 
-     * @param crls CRLs respresented by this credential
-     */
-    public void setCrls(List<X509CRL> crls) {
-        this.x509crls = crls;
-    }
-
-    /**
-     * Sets the private key respresented by this credential.
-     * 
-     * @param key private key respresented by this credential
-     */
-    public void setPrivateKey(PrivateKey key) {
-        privateKey = key;
-    }
-    
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/all-wcprops
deleted file mode 100644
index 88a9136..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/all-wcprops
+++ /dev/null
@@ -1,53 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml
-END
-SAMLSecurityNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 157
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/SAMLSecurityNamespaceHandler.java
-END
-SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 176
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java
-END
-MessageReplayRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/MessageReplayRuleBeanDefinitionParser.java
-END
-SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 177
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java
-END
-SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 194
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java
-END
-SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java
-END
-IssueInstantRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/IssueInstantRuleBeanDefinitionParser.java
-END
-MandatoryIssuerRuleBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/MandatoryIssuerRuleBeanDefinitionParser.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/entries
deleted file mode 100644
index 6ce9f09..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/entries
+++ /dev/null
@@ -1,300 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.750817Z
-acd4a02b6a63ff76ee73a56612b85a7c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2157
-

-IssueInstantRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.750817Z
-a7b80e0b4e3c0e2b96b1eedad366adc1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3065
-

-MandatoryIssuerRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.750817Z
-e577b943ea8b33a42a085de7cd5eba05
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1850
-

-SAMLSecurityNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:44.746817Z
-2d7365a62140b044c0c780845815bf23
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2544
-

-SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.750817Z
-549aabea2148ec3be4b2e0aabad77686
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3155
-

-MessageReplayRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.750817Z
-0272b3947a1c1d3d6d643ac72bd5404d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2365
-

-SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.750817Z
-0e2b6ab8d7f99bc819e61ae53b236db6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1928
-

-SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:44.750817Z
-9a034463c1b69e0ddc2492d678528cb3
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2185
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/IssueInstantRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/IssueInstantRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/IssueInstantRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/MandatoryIssuerRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/MandatoryIssuerRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/MandatoryIssuerRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/MessageReplayRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/MessageReplayRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/MessageReplayRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAMLSecurityNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAMLSecurityNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/prop-base/SAMLSecurityNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/IssueInstantRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/IssueInstantRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 40e3fbe..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/IssueInstantRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.common.binding.security.IssueInstantRule;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Spring bean definition parser for issue instant rules.
- */
-public class IssueInstantRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLSecurityNamespaceHandler.NAMESPACE, "IssueInstant");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return IssueInstantRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        long skew = 300;
-        if (element.hasAttributeNS(null, "clockSkew")) {
-            skew = SpringConfigurationUtils.parseDurationToMillis("'clockSkew' on security rule of type "
-                    + XMLHelper.getXSIType(element), element.getAttributeNS(null, "clockSkew"), 1000) / 1000;
-        }
-        builder.addConstructorArgValue(skew);
-
-        long expirationThreshold = 60;
-        if (element.hasAttributeNS(null, "expirationThreshold")) {
-            expirationThreshold = SpringConfigurationUtils.parseDurationToMillis(
-                    "'expirationThreshold' on security rule of type " + XMLHelper.getXSIType(element), element
-                            .getAttributeNS(null, "expirationThreshold"), 1000) / 1000;
-        }
-        builder.addConstructorArgValue(expirationThreshold);
-
-        if (element.hasAttributeNS(null, "required")) {
-            builder.addPropertyValue("requiredRule", XMLHelper.getAttributeValueAsBoolean(element.getAttributeNodeNS(
-                    null, "required")));
-        } else {
-            builder.addPropertyValue("requiredRule", true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/MandatoryIssuerRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/MandatoryIssuerRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index cc653d3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/MandatoryIssuerRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.ws.security.provider.MandatoryIssuerRule;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for mandatory issuer rules.
- */
-public class MandatoryIssuerRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLSecurityNamespaceHandler.NAMESPACE, "MandatoryIssuer");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MandatoryIssuerRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/MessageReplayRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/MessageReplayRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 837790e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/MessageReplayRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.common.binding.security.MessageReplayRule;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for message replay rules.
- */
-public class MessageReplayRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLSecurityNamespaceHandler.NAMESPACE, "Replay");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return MessageReplayRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgReference(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "replayCacheRef")));
-
-        if (element.hasAttributeNS(null, "required")) {
-            builder.addPropertyValue("requiredRule", XMLHelper.getAttributeValueAsBoolean(element.getAttributeNodeNS(
-                    null, "required")));
-        } else {
-            builder.addPropertyValue("requiredRule", true);
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 93e7c5a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2AuthnRequestsSignedRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.binding.security.SAML2AuthnRequestsSignedRule;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for {urn:mace:shibboleth:2.0:security:saml}SAML2AuthnRequestsSigned
- */
-public class SAML2AuthnRequestsSignedRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-    
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLSecurityNamespaceHandler.NAMESPACE, "SAML2AuthnRequestsSigned");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2AuthnRequestsSignedRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 6c1e22d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.binding.security.SAML2HTTPPostSimpleSignRule;
-import org.opensaml.xml.security.keyinfo.BasicProviderKeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoCredentialResolver;
-import org.opensaml.xml.security.keyinfo.KeyInfoProvider;
-import org.opensaml.xml.security.keyinfo.provider.DSAKeyValueProvider;
-import org.opensaml.xml.security.keyinfo.provider.InlineX509DataProvider;
-import org.opensaml.xml.security.keyinfo.provider.RSAKeyValueProvider;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security:saml}SAML2HTTPPostSimpleSign. */
-public class SAML2HTTPPostSimpleSignRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLSecurityNamespaceHandler.NAMESPACE, "SAML2HTTPPostSimpleSign");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2HTTPPostSimpleSignRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgReference(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "trustEngineRef")));
-
-        builder.addConstructorArgReference(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "parserPoolRef")));
-
-        List<KeyInfoProvider> keyInfoProviders = new ArrayList<KeyInfoProvider>();
-        keyInfoProviders.add(new DSAKeyValueProvider());
-        keyInfoProviders.add(new RSAKeyValueProvider());
-        keyInfoProviders.add(new InlineX509DataProvider());
-        KeyInfoCredentialResolver keyInfoCredResolver = new BasicProviderKeyInfoCredentialResolver(keyInfoProviders);
-        builder.addConstructorArgValue(keyInfoCredResolver);
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 05c5081..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.binding.security.SAML2HTTPRedirectDeflateSignatureRule;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/** Spring bean definition parser for {urn:mace:shibboleth:2.0:security:saml}SAML2HTTPRedirectSimpleSign. */
-public class SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLSecurityNamespaceHandler.NAMESPACE,
-            "SAML2HTTPRedirectSimpleSign");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAML2HTTPRedirectDeflateSignatureRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgReference(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "trustEngineRef")));
-        
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java.svn-base
deleted file mode 100644
index c9dc86f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.common.binding.security.SAMLProtocolMessageXMLSignatureSecurityPolicyRule;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.w3c.dom.Element;
-
-/** Spring bean definition for {urn:mace:shibboleth:2.0:security:saml}ProtocolWithXMLSignature elements. */
-public class SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser extends
-        AbstractSingleBeanDefinitionParser {
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(SAMLSecurityNamespaceHandler.NAMESPACE,
-            "ProtocolWithXMLSignature");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return SAMLProtocolMessageXMLSignatureSecurityPolicyRule.class;
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element element, BeanDefinitionBuilder builder) {
-        builder.addConstructorArgReference(DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null,
-                "trustEngineRef")));
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAMLSecurityNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAMLSecurityNamespaceHandler.java.svn-base
deleted file mode 100644
index be61b92..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/security/saml/.svn/text-base/SAMLSecurityNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security.saml;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/**
- * Spring namespace handler for SAML security objects.
- */
-public class SAMLSecurityNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for SAML security elements. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:security:saml";
-
-    /** {@inheritDoc} */
-    public void init() {
-        registerBeanDefinitionParser(SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser.SCHEMA_TYPE,
-                new SAMLProtocolMessageXMLSignatureSecurityPolicyBeanDefinitionParser());
-
-        registerBeanDefinitionParser(IssueInstantRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new IssueInstantRuleBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MessageReplayRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new MessageReplayRuleBeanDefinitionParser());
-
-        registerBeanDefinitionParser(MandatoryIssuerRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new MandatoryIssuerRuleBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2HTTPPostSimpleSignRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new SAML2HTTPPostSimpleSignRuleBeanDefinitionParser());
-
-        registerBeanDefinitionParser(SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new SAML2HTTPRedirectDeflateSignatureRuleBeanDefinitionParser());
-        
-        registerBeanDefinitionParser(SAML2AuthnRequestsSignedRuleBeanDefinitionParser.SCHEMA_TYPE,
-                new SAML2AuthnRequestsSignedRuleBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/all-wcprops
deleted file mode 100644
index 62513e1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 117
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service
-END
-AbstractReloadableServiceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/AbstractReloadableServiceBeanDefinitionParser.java
-END
-ServiceNamespaceHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 146
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/ServiceNamespaceHandler.java
-END
-ServicesBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/ServicesBeanDefinitionParser.java
-END
-AbstractServiceBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/AbstractServiceBeanDefinitionParser.java
-END
-ServletContextAttributeExporterBeanDefinitionParser.java
-K 25
-svn:wc:ra_dav:version-url
-V 174
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/ServletContextAttributeExporterBeanDefinitionParser.java
-END
-ServletContextAttributeExporter.java
-K 25
-svn:wc:ra_dav:version-url
-V 154
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/ServletContextAttributeExporter.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/entries
deleted file mode 100644
index 4df723a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/entries
+++ /dev/null
@@ -1,232 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/service
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AbstractServiceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.818779Z
-a4c3fb56634f24c522cefb35cc812739
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2808
-

-ServletContextAttributeExporterBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.818779Z
-069d942ba78f2d24e0eb860af4dbc2d8
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2396
-

-ServletContextAttributeExporter.java
-file
-
-
-
-
-2014-02-19T17:27:42.818779Z
-91d3a8e104efa2de668503308d669729
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3838
-

-AbstractReloadableServiceBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.818779Z
-c0713f2313e559c8ea380dbe72526376
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3123
-

-ServiceNamespaceHandler.java
-file
-
-
-
-
-2014-02-19T17:27:42.818779Z
-422b322d4b88505d75af90efb966e2c6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1740
-

-ServicesBeanDefinitionParser.java
-file
-
-
-
-
-2014-02-19T17:27:42.818779Z
-82446c16b0810e750bfe29ec639e6812
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1996
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/AbstractReloadableServiceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/AbstractReloadableServiceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/AbstractReloadableServiceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/AbstractServiceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/AbstractServiceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/AbstractServiceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServiceNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServiceNamespaceHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServiceNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServicesBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServicesBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServicesBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServletContextAttributeExporter.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServletContextAttributeExporter.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServletContextAttributeExporter.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServletContextAttributeExporterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServletContextAttributeExporterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/prop-base/ServletContextAttributeExporterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/AbstractReloadableServiceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/AbstractReloadableServiceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 91b6b24..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/AbstractReloadableServiceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.service;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/**
- * Base bean definition parser for reloadable services.
- */
-public abstract class AbstractReloadableServiceBeanDefinitionParser extends AbstractServiceBeanDefinitionParser {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AbstractReloadableServiceBeanDefinitionParser.class);
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, parserContext, builder);
-
-        if (configElement.hasAttributeNS(null, "configurationResourcePollingFrequency")) {
-            builder.addPropertyReference("pollingTimer", configElement.getAttributeNS(null, "timerId"));
-
-            long frequency = SpringConfigurationUtils.parseDurationToMillis(
-                    "'configurationResourcePollingFrequency' on service " + configElement.getAttributeNS(null, "id"),
-                    configElement.getAttributeNS(null, "configurationResourcePollingFrequency"), 1);
-            builder.addPropertyValue("pollingFrequency", frequency);
-            log.debug("{} service configuration polling frequency: {}ms", getServiceId(configElement), frequency);
-
-            int retryAttempts = 0;
-            if (configElement.hasAttributeNS(null, "configurationResourcePollingRetryAttempts")) {
-                retryAttempts = Integer.parseInt(DatatypeHelper.safeTrimOrNullString(configElement.getAttributeNS(null,
-                        "configurationResourcePollingRetryAttempts")));
-            }
-            if (retryAttempts < 1) {
-                retryAttempts = 3;
-            }
-            builder.addPropertyValue("pollingRetryAttempts", retryAttempts);
-            log.debug("{} service configuration polling retry attempts: {}", getServiceId(configElement),
-                            retryAttempts);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/AbstractServiceBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/AbstractServiceBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 5dc0c11..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/AbstractServiceBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.service;
-
-import java.util.List;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Base bean definition parser for service objects. */
-public abstract class AbstractServiceBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        List<Element> configurationResources = XMLHelper.getChildElementsByTagNameNS(configElement,
-                ServiceNamespaceHandler.NAMESPACE, "ConfigurationResource");
-        builder.addPropertyValue("serviceConfigurations", SpringConfigurationUtils.parseInnerCustomElements(
-                configurationResources, parserContext));
-
-        builder.addDependsOn("shibboleth.LogbackLogging");
-        for (String dependency : XMLHelper
-                .getAttributeValueAsList(configElement.getAttributeNodeNS(null, "depends-on"))) {
-            builder.addDependsOn(dependency);
-        }
-
-        builder.setInitMethodName("initialize");
-    }
-
-    /** {@inheritDoc} */
-    protected String resolveId(Element configElement, AbstractBeanDefinition beanDef, ParserContext parserContext) {
-        return getServiceId(configElement);
-    }
-    
-    /**
-     * Gets the ID of the service.
-     * 
-     * @param configElement service configuration element
-     * 
-     * @return ID of the service
-     */
-    protected String getServiceId(Element configElement){
-        return configElement.getAttributeNS(null, "id");
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServiceNamespaceHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServiceNamespaceHandler.java.svn-base
deleted file mode 100644
index 9bc2342..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServiceNamespaceHandler.java.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.service;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseSpringNamespaceHandler;
-
-/** Spring namespace handler for service definitions. */
-public class ServiceNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Services namespace URI. */
-    public static final String NAMESPACE = "urn:mace:shibboleth:2.0:services";
-
-    /** {@inheritDoc} */
-    public void init() {
-        ServicesBeanDefinitionParser parser = new ServicesBeanDefinitionParser();
-        registerBeanDefinitionParser(ServicesBeanDefinitionParser.ELEMENT_NAME, parser);
-        registerBeanDefinitionParser(ServicesBeanDefinitionParser.SCHEMA_TYPE, parser);
-
-        registerBeanDefinitionParser(ServletContextAttributeExporterBeanDefinitionParser.TYPE_NAME,
-                new ServletContextAttributeExporterBeanDefinitionParser());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServicesBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServicesBeanDefinitionParser.java.svn-base
deleted file mode 100644
index d5c56b0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServicesBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.service;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.config.SpringConfigurationUtils;
-
-/** Bean definition parser for IdP services config root element. */
-public class ServicesBeanDefinitionParser implements BeanDefinitionParser {
-
-    /** Element name. */
-    public static final QName ELEMENT_NAME = new QName(ServiceNamespaceHandler.NAMESPACE, "Services");
-
-    /** Schema type. */
-    public static final QName SCHEMA_TYPE = new QName(ServiceNamespaceHandler.NAMESPACE, "ServicesType");
-
-    /** {@inheritDoc} */
-    public BeanDefinition parse(Element config, ParserContext context) {
-        SpringConfigurationUtils.parseCustomElements(XMLHelper.getChildElementsByTagNameNS(config,
-                ServiceNamespaceHandler.NAMESPACE, "Service"), context);
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServletContextAttributeExporter.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServletContextAttributeExporter.java.svn-base
deleted file mode 100644
index b32308b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServletContextAttributeExporter.java.svn-base
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.service;
-
-import java.util.Collection;
-
-import javax.servlet.ServletContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.web.context.WebApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.service.Service;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/** A simple service that exports Spring beans into the Servlet context as an attribute. */
-public class ServletContextAttributeExporter implements Service, ApplicationContextAware, BeanNameAware {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ServletContextAttributeExporter.class);
-
-    /** Application context into which we're loaded. */
-    private ApplicationContext appCtx;
-
-    /** ID of this service. */
-    private String id;
-
-    /** Whether this service has been initialized. */
-    private boolean initialized;
-
-    /** ID of beans exported into the servlet context. */
-    private Collection<String> exportedBeans;
-
-    /**
-     * Constructor.
-     * 
-     * @param beans ID of beans exported into the servlet context
-     */
-    public ServletContextAttributeExporter(Collection<String> beans) {
-        exportedBeans = beans;
-    }
-
-    /** {@inheritDoc} */
-    public void destroy() throws ServiceException {
-
-    }
-
-    /** {@inheritDoc} */
-    public String getId() {
-        return id;
-    }
-
-    /** {@inheritDoc} */
-    public void initialize() throws ServiceException {
-        if (!(appCtx instanceof WebApplicationContext)) {
-            log.warn("This service may only be used when services are loaded within a web application context.");
-            return;
-        }
-
-        Object bean;
-        if (exportedBeans != null) {
-            WebApplicationContext webAppCtx = (WebApplicationContext) appCtx;
-            ServletContext servletCtx = webAppCtx.getServletContext();
-            for (String beanId : exportedBeans) {
-                bean = webAppCtx.getBean(beanId);
-                if(bean != null){
-                    log.debug("Exporting bean {} to servlet context.", beanId);
-                    servletCtx.setAttribute(beanId, bean);
-                }else{
-                    log.warn("No {} bean located, unable to export it to the servlet context", beanId);
-                }
-            }
-        }
-
-        initialized = true;
-    }
-
-    /** {@inheritDoc} */
-    public boolean isInitialized() {
-        return initialized;
-    }
-
-    /** {@inheritDoc} */
-    public void setApplicationContext(ApplicationContext context) {
-        appCtx = context;
-    }
-
-    /** {@inheritDoc} */
-    public void setBeanName(String name) {
-        id = name;
-    }
-
-    /** {@inheritDoc} */
-    public boolean isDestroyed() {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServletContextAttributeExporterBeanDefinitionParser.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServletContextAttributeExporterBeanDefinitionParser.java.svn-base
deleted file mode 100644
index 9ba33db..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/config/service/.svn/text-base/ServletContextAttributeExporterBeanDefinitionParser.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.service;
-
-import java.util.ArrayList;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.util.XMLHelper;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/** Bean parser for service Servlet attribute exporter service. */
-public class ServletContextAttributeExporterBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
-
-    /** Type name. */
-    public static final QName TYPE_NAME = new QName(ServiceNamespaceHandler.NAMESPACE,
-            "ServletContextAttributeExporter");
-
-    /** {@inheritDoc} */
-    protected Class getBeanClass(Element element) {
-        return ServletContextAttributeExporter.class;
-    }
-
-    /** {@inheritDoc} */
-    protected void doParse(Element configElement, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        super.doParse(configElement, parserContext, builder);
-        
-        builder.setInitMethodName("initialize");
-
-        ArrayList<String> services = new ArrayList<String>();
-        for (String dependency : XMLHelper
-                .getAttributeValueAsList(configElement.getAttributeNodeNS(null, "depends-on"))) {
-            services.add(dependency);
-        }
-        builder.addConstructorArgValue(services);
-    }
-
-    /** {@inheritDoc} */
-    protected boolean shouldGenerateId() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/all-wcprops
deleted file mode 100644
index 1ea613f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/all-wcprops
+++ /dev/null
@@ -1,35 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 106
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/log
-END
-SLF4JMDCCleanupFilter.java
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/log/SLF4JMDCCleanupFilter.java
-END
-AccessLogEntry.java
-K 25
-svn:wc:ra_dav:version-url
-V 126
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/log/AccessLogEntry.java
-END
-LogbackConfigurationChangeListener.java
-K 25
-svn:wc:ra_dav:version-url
-V 146
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/log/LogbackConfigurationChangeListener.java
-END
-AuditLogEntry.java
-K 25
-svn:wc:ra_dav:version-url
-V 125
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/log/AuditLogEntry.java
-END
-LogbackLoggingService.java
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/log/LogbackLoggingService.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/entries
deleted file mode 100644
index 0293683..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/entries
+++ /dev/null
@@ -1,198 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/log
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SLF4JMDCCleanupFilter.java
-file
-
-
-
-
-2014-02-19T17:27:41.146746Z
-0f6fb82fb3f9af22c79610ef6b8dd057
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2057
-

-AccessLogEntry.java
-file
-
-
-
-
-2014-02-19T17:27:41.146746Z
-fb819f25b21e81f2fd9f71c3e4552c51
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4560
-

-LogbackConfigurationChangeListener.java
-file
-
-
-
-
-2014-02-19T17:27:41.146746Z
-5346d761ab14234a3c731fd307a6db49
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3237
-

-AuditLogEntry.java
-file
-
-
-
-
-2014-02-19T17:27:41.146746Z
-9efdffed41b810ab4f8e1794115b9cf1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9086
-

-LogbackLoggingService.java
-file
-
-
-
-
-2014-02-19T17:27:41.146746Z
-9fee16d8b5600f67997ba9c83a44a9a0
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2786
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/AccessLogEntry.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/AccessLogEntry.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/AccessLogEntry.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/AuditLogEntry.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/AuditLogEntry.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/AuditLogEntry.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/LogbackConfigurationChangeListener.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/LogbackConfigurationChangeListener.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/LogbackConfigurationChangeListener.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/LogbackLoggingService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/LogbackLoggingService.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/LogbackLoggingService.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/SLF4JMDCCleanupFilter.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/SLF4JMDCCleanupFilter.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/prop-base/SLF4JMDCCleanupFilter.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/AccessLogEntry.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/AccessLogEntry.java.svn-base
deleted file mode 100644
index fa36d20..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/AccessLogEntry.java.svn-base
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.log;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-import org.opensaml.xml.util.DatatypeHelper;
-
-import edu.internet2.middleware.shibboleth.common.util.HttpHelper;
-
-/**
- * Data object for generating server access logs.
- */
-public class AccessLogEntry {
-    
-    /** Name of the Shibboleth Access logging category. */
-    public static final String ACCESS_LOGGER_NAME = "Shibboleth-Access";
-    
-    /** Formatter used to convert timestamps to strings. */
-    private static DateTimeFormatter dateFormatter = ISODateTimeFormat.basicDateTimeNoMillis();
-    
-    /** Request timestamp. */
-    private DateTime requestTime;
-
-    /** Hostname or IP address of the remote host. */
-    private String remoteHost;
-
-    /** Hostname or IP address of the server. */
-    private String serverHost;
-
-    /** Port the request came in on. */
-    private int serverPort;
-
-    /** Path of the request. */
-    private String requestPath;
-
-    /**
-     * Constructor.
-     * 
-     * @param request the request
-     */
-    public AccessLogEntry(HttpServletRequest request) {
-        requestTime = new DateTime();
-        remoteHost = request.getRemoteHost();
-        serverHost = request.getServerName();
-        serverPort = request.getServerPort();
-        requestPath = HttpHelper.getRequestUriWithoutContext(request);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param remote the remote client host name or IP
-     * @param host the servers host name or IP
-     * @param port the servers port number
-     * @param path the request path informatio minus the servlet context information
-     */
-    public AccessLogEntry(String remote, String host, int port, String path) {
-        requestTime = new DateTime();
-        remoteHost = DatatypeHelper.safeTrimOrNullString(remote);
-        serverHost = DatatypeHelper.safeTrimOrNullString(host);
-        serverPort = port;
-        requestPath = DatatypeHelper.safeTrimOrNullString(path);
-    }
-
-    /**
-     * Gets the remote client host or IP address.
-     * 
-     * @return remote client host or IP address
-     */
-    public String getRemoteHost() {
-        return remoteHost;
-    }
-
-    /**
-     * Gets the request path without servlet context information.
-     * 
-     * @return request path without servlet context information
-     */
-    public String getRequestPath() {
-        return requestPath;
-    }
-    
-    /**
-     * Gets the time the request was made.
-     * 
-     * @return time the request was made
-     */
-    public DateTime getRequestTime(){
-        return requestTime;
-    }
-
-    /**
-     * Gets the server's host name or IP address.
-     * 
-     * @return server's host name or IP address
-     */
-    public String getServerHost() {
-        return serverHost;
-    }
-
-    /**
-     * Gets the server's port number.
-     * 
-     * @return server's port number
-     */
-    public int getServerPort() {
-        return serverPort;
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        StringBuilder entryString = new StringBuilder();
-
-        entryString.append(getRequestTime().toString(dateFormatter.withZone(DateTimeZone.UTC)));
-        entryString.append("|");
-
-        entryString.append(getRemoteHost());
-        entryString.append("|");
-
-        entryString.append(getServerHost());
-        entryString.append(":");
-        entryString.append(getServerPort());
-        entryString.append("|");
-
-        entryString.append(getRequestPath());
-        entryString.append("|");
-
-        return entryString.toString();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/AuditLogEntry.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/AuditLogEntry.java.svn-base
deleted file mode 100644
index f8ccc42..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/AuditLogEntry.java.svn-base
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-
-/**
- * Represents an auditable event in the system.
- */
-public class AuditLogEntry {
-
-    /** Name of the Logger for the shibboleth audit log. */
-    public static final String AUDIT_LOGGER_NAME = "Shibboleth-Audit";
-    
-    /** Formatter used to convert timestamps to strings. */
-    private static DateTimeFormatter dateFormatter = ISODateTimeFormat.basicDateTimeNoMillis();
-
-    /** UTC IS8601 timestamp of the audit event. */
-    private DateTime auditEventTime;
-
-    /** Entity ID of the provider (message issuer). */
-    private String assertingPartyId;
-
-    /** Entity ID of the relying party. */
-    private String relyingPartyId;
-
-    /** URI of binding used by the relying party. */
-    private String requestBinding;
-
-    /** URI of binding used to respond to relying party. */
-    private String responseBinding;
-
-    /** URI of profile in use. */
-    private String messageProfile;
-
-    /** Unique ID of the request message. */
-    private String requestId;
-
-    /** Unqiue ID of the response message. */
-    private String responseId;
-
-    /** Principal ID of the user the request was made about. */
-    private String principalName;
-
-    /** URIs of the authentication methods currently active for the user. */
-    private String principalAuthenticationMethod;
-
-    /** Internal ID of the user attributes released. */
-    private List<String> releasedAttributes;
-    
-    /** Value of the SAML name identifier. */
-    private String nameIdValue;
-
-    /** Constructor. */
-    public AuditLogEntry() {
-        auditEventTime = new DateTime();
-        releasedAttributes = new ArrayList<String>();
-    }
-    
-    /**
-     * Gets the provider (message issuer) ID.
-     * 
-     * @return provider (message issuer) ID
-     */
-    public String getAssertingPartyId() {
-        return assertingPartyId;
-    }
-    
-    /**
-     * Gets the timestamp for this audit event.
-     * 
-     * @return timestamp for this audit event
-     */
-    public DateTime getAuditEventTime() {
-        return auditEventTime;
-    }
-
-    /**
-     * Gets the URI of the message profile being used.
-     * 
-     * @return URI of the message profile being used
-     */
-    public String getMessageProfile() {
-        return messageProfile;
-    }
-
-    /**
-     * Gets the value of the SAML name identifier.
-     * @return value of the SAML name identifier
-     */
-    public String getNameIdValue() {
-        return nameIdValue;
-    }
-
-    /**
-     * Gets the authentication method, identified by their URI, used to log into the relying party.
-     * 
-     * @return authentication method, identified by their URI, used to log into the relying party
-     */
-    public String getPrincipalAuthenticationMethod() {
-        return principalAuthenticationMethod;
-    }
-
-    /**
-     * Gets the principal ID of the user.
-     * 
-     * @return principal ID of the user
-     */
-    public String getPrincipalName() {
-        return principalName;
-    }
-
-    /**
-     * Gets the list of internal IDs of the attributes that were released.
-     * 
-     * @return internal IDs of the attributes that were released
-     */
-    public List<String> getReleasedAttributes() {
-        return releasedAttributes;
-    }
-
-    /**
-     * Gets the entity ID of the relying party.
-     * 
-     * @return entity ID of the relying party
-     */
-    public String getRelyingPartyId() {
-        return relyingPartyId;
-    }
-
-    /**
-     * Gets the URI of the binding used during the request.
-     * 
-     * @return URI of the binding used during the request
-     */
-    public String getRequestBinding() {
-        return requestBinding;
-    }
-
-    /**
-     * Gets the unique ID of the request.
-     * 
-     * @return unique ID of the request
-     */
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Gets the URI of the binding used during the response.
-     * 
-     * @return URI of the binding used during the response
-     */
-    public String getResponseBinding() {
-        return responseBinding;
-    }
-
-    /**
-     * Gets the unique ID of the response message.
-     * 
-     * @return unique ID of the response message
-     */
-    public String getResponseId() {
-        return responseId;
-    }
-
-    /**
-     * Sets the provider (message issuer) ID.
-     * 
-     * @param id provider (message issuer) ID
-     */
-    public void setAssertingPartyId(String id) {
-        assertingPartyId = id;
-    }
-
-    /**
-     * Sets the URI of the message profile being used.
-     * 
-     * @param profileURI URI of the message profile being used
-     */
-    public void setMessageProfile(String profileURI) {
-        messageProfile = profileURI;
-    }
-
-    /**
-     * Sets the value of the SAML name identifier.
-     * 
-     * @param value value of the SAML name identifier
-     */
-    public void setNameIdValue(String value) {
-        nameIdValue = value;
-    }
-
-    /**
-     * Sets the authentication method, identified by their URI, used to log into the relying party.
-     * 
-     * @param method authentication method, identified by their URI, used to log into the relying party
-     */
-    public void setPrincipalAuthenticationMethod(String method) {
-        principalAuthenticationMethod = method;
-    }
-
-    /**
-     * Sets the principal ID of the user.
-     * 
-     * @param id principal ID of the user
-     */
-    public void setPrincipalName(String id) {
-        principalName = id;
-    }
-
-    /**
-     * Sets the entity ID of the relying party.
-     * 
-     * @param entityId entity ID of the relying party
-     */
-    public void setRelyingPartyId(String entityId) {
-        relyingPartyId = entityId;
-    }
-
-    /**
-     * Sets the URI of the binding used during the request.
-     * 
-     * @param bindingURI URI of the binding used during the request
-     */
-    public void setRequestBinding(String bindingURI) {
-        requestBinding = bindingURI;
-    }
-
-    /**
-     * Sets the unique ID of the request.
-     * 
-     * @param id unique ID of the request
-     */
-    public void setRequestId(String id) {
-        requestId = id;
-    }
-
-    /**
-     * Sets the URI of the binding used during the response.
-     * 
-     * @param bindingURI URI of the binding used during the response
-     */
-    public void setResponseBinding(String bindingURI) {
-        responseBinding = bindingURI;
-    }
-
-    /**
-     * Sets the unique ID of the response message.
-     * 
-     * @param id unique ID of the response message
-     */
-    public void setResponseId(String id) {
-        responseId = id;
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        StringBuilder entryString = new StringBuilder();
-
-        entryString.append(getAuditEventTime().toString(dateFormatter.withZone(DateTimeZone.UTC)));
-        entryString.append("|");
-
-        if (getRequestBinding() != null) {
-            entryString.append(getRequestBinding());
-        }
-        entryString.append("|");
-
-        if (getRequestId() != null) {
-            entryString.append(getRequestId());
-        }
-        entryString.append("|");
-
-        entryString.append(getRelyingPartyId());
-        entryString.append("|");
-
-        entryString.append(getMessageProfile());
-        entryString.append("|");
-
-        entryString.append(getAssertingPartyId());
-        entryString.append("|");
-
-        entryString.append(getResponseBinding());
-        entryString.append("|");
-
-        entryString.append(getResponseId());
-        entryString.append("|");
-
-        if (getPrincipalName() != null) {
-            entryString.append(getPrincipalName());
-        }
-        entryString.append("|");
-
-        if (getPrincipalAuthenticationMethod() != null) {
-            entryString.append(getPrincipalAuthenticationMethod());
-        }
-        entryString.append("|");
-
-        for (String attribute : getReleasedAttributes()) {
-            entryString.append(attribute);
-            entryString.append(",");
-        }
-        entryString.append("|");
-
-        return entryString.toString();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/LogbackConfigurationChangeListener.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/LogbackConfigurationChangeListener.java.svn-base
deleted file mode 100644
index ac2fc5c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/LogbackConfigurationChangeListener.java.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.log;
-
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.resource.ResourceChangeListener;
-import org.opensaml.util.resource.ResourceException;
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.status.ErrorStatus;
-import ch.qos.logback.core.status.InfoStatus;
-import ch.qos.logback.core.status.StatusManager;
-import ch.qos.logback.core.util.StatusPrinter;
-
-/** Callback that may be registered for a watch logback configuration file. */
-public class LogbackConfigurationChangeListener implements ResourceChangeListener {
-
-    /** {@inheritDoc} */
-    public void onResourceCreate(Resource resource) {
-        configureLogback(resource);
-    }
-
-    /** {@inheritDoc} */
-    public void onResourceDelete(Resource resource) {
-        // do nothing
-    }
-
-    /** {@inheritDoc} */
-    public void onResourceUpdate(Resource resource) {
-        configureLogback(resource);
-    }
-
-    /**
-     * Configures logback using the given resource as the Joran configuration file.
-     * 
-     * @param configuration logback configuration file
-     */
-    protected void configureLogback(Resource configuration) {
-        LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-        StatusManager statusManager = loggerContext.getStatusManager();
-        statusManager.add(new InfoStatus("Loading logging configuration file: " + configuration.getLocation(), this));
-        try {
-            //loggerContext.stop();
-            loggerContext.reset();
-            JoranConfigurator configurator = new JoranConfigurator();
-            configurator.setContext(loggerContext);
-            configurator.doConfigure(configuration.getInputStream());
-            loggerContext.start();
-        } catch (JoranException e) {
-            statusManager.add(new ErrorStatus("Error loading logging configuration file: "
-                    + configuration.getLocation(), this, e));
-        } catch (ResourceException e) {
-            statusManager.add(new ErrorStatus("Error loading logging configuration file: "
-                    + configuration.getLocation(), this, e));
-        }
-        StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext); 
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/LogbackLoggingService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/LogbackLoggingService.java.svn-base
deleted file mode 100644
index 80f02e3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/LogbackLoggingService.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.log;
-
-import java.util.Timer;
-
-import org.opensaml.util.resource.FilesystemResource;
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.resource.ResourceChangeWatcher;
-import org.opensaml.util.resource.ResourceException;
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.status.ErrorStatus;
-import ch.qos.logback.core.status.StatusManager;
-
-/**
- * Simple logging service that watches for logback configuration file changes and reloads the file when a change occurs.
- */
-public class LogbackLoggingService {
-
-    /**
-     * Constructor.
-     *
-     * @param taskTimer resource watchdog task timer
-     * @param loggingConfigurationFile logback configuration file
-     * @param pollingFrequency frequency the configuration file should be checked for changes
-     */
-    public LogbackLoggingService(Timer taskTimer, String loggingConfigurationFile, long pollingFrequency) {
-        LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-        StatusManager statusManager = loggerContext.getStatusManager();
-        
-        try{
-            Resource configResource = new FilesystemResource(loggingConfigurationFile);
-            LogbackConfigurationChangeListener configChangeListener = new LogbackConfigurationChangeListener();
-            configChangeListener.onResourceCreate(configResource);
-            
-            ResourceChangeWatcher resourceWatcher = new ResourceChangeWatcher(configResource, pollingFrequency, 5);
-            resourceWatcher.getResourceListeners().add(configChangeListener);
-            
-            taskTimer.schedule(resourceWatcher, 0, pollingFrequency);
-        }catch(ResourceException e){
-            statusManager.add(new ErrorStatus("Error loading logging configuration file: "
-                    + loggingConfigurationFile, this, e));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/SLF4JMDCCleanupFilter.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/SLF4JMDCCleanupFilter.java.svn-base
deleted file mode 100644
index 8278503..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/log/.svn/text-base/SLF4JMDCCleanupFilter.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.log;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.slf4j.MDC;
-
-/**
- * A Servlet filter which clears all the MDC state that has been accumulated during the processing of a request. It
- * should be installed as near as possible to the beginning of the effective filter chain - and in particular prior to
- * any filters which make use of MDC in their own logging - so that this filter will be last when the request stack
- * unwinds.
- */
-public class SLF4JMDCCleanupFilter implements Filter {
-
-    /** {@inheritDoc} */
-    public void destroy() {
-    }
-
-    /** {@inheritDoc} */
-    public void init(FilterConfig filterConfig) throws ServletException {
-    }
-
-    /** {@inheritDoc} */
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
-            ServletException {
-
-        try {
-            chain.doFilter(request, response);
-        } finally {
-            MDC.clear();
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/all-wcprops
deleted file mode 100644
index a6eab22..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/all-wcprops
+++ /dev/null
@@ -1,47 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 111
-/java-shib-common/!svn/ver/1044/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile
-END
-ProfileHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 130
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/ProfileHandler.java
-END
-ProfileRequestContext.java
-K 25
-svn:wc:ra_dav:version-url
-V 137
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/ProfileRequestContext.java
-END
-ProfileException.java
-K 25
-svn:wc:ra_dav:version-url
-V 132
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/ProfileException.java
-END
-ProfileRequestDispatcherServlet.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/1044/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/ProfileRequestDispatcherServlet.java
-END
-ProfileHandlerManager.java
-K 25
-svn:wc:ra_dav:version-url
-V 137
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/ProfileHandlerManager.java
-END
-NoProfileHandlerException.java
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/NoProfileHandlerException.java
-END
-AbstractErrorHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 136
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/AbstractErrorHandler.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/entries
deleted file mode 100644
index 91e43f7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/entries
+++ /dev/null
@@ -1,269 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-19T19:41:01.376709Z
-1044
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ProfileHandlerManager.java
-file
-
-
-
-
-2014-02-19T17:27:41.018744Z
-421426ae00b363fc1074758eb942c19b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1844
-

-provider
-dir
-

-NoProfileHandlerException.java
-file
-
-
-
-
-2014-02-19T17:27:41.018744Z
-c9e7674f3d554edc8d5b98988e803b55
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1964
-

-AbstractErrorHandler.java
-file
-
-
-
-
-2014-02-19T17:27:41.018744Z
-d4284bccb5e0e9c1755887e02468599f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1560
-

-ProfileHandler.java
-file
-
-
-
-
-2014-02-19T17:27:41.018744Z
-99e480870116996c5a47cebb569c38cb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1686
-

-ProfileRequestContext.java
-file
-
-
-
-
-2014-02-19T17:27:41.018744Z
-e5a944fc2e7db8260163c2e271735042
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3226
-

-ProfileException.java
-file
-
-
-
-
-2014-02-19T17:27:41.018744Z
-5f963e99f2a8b4d5bb357280a06cd991
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1943
-

-ProfileRequestDispatcherServlet.java
-file
-
-
-
-
-2014-02-19T17:27:41.018744Z
-38f72a509a8fb3f40bd7fcadee534506
-2012-11-19T19:41:01.376709Z
-1044
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4141
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/AbstractErrorHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/AbstractErrorHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/AbstractErrorHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/NoProfileHandlerException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/NoProfileHandlerException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/NoProfileHandlerException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileHandlerManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileHandlerManager.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileHandlerManager.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileRequestContext.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileRequestContext.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileRequestDispatcherServlet.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileRequestDispatcherServlet.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/prop-base/ProfileRequestDispatcherServlet.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/AbstractErrorHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/AbstractErrorHandler.java.svn-base
deleted file mode 100644
index 31536a8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/AbstractErrorHandler.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile;
-
-import org.opensaml.ws.transport.InTransport;
-import org.opensaml.ws.transport.OutTransport;
-
-/**
- * Error handlers are invoked when an error is encountered during request processing.
- * 
- * Error handlers expect the error to be reported to be bound to the servlet request attribute identified by
- * {@link #ERROR_KEY} and be of type {@link Throwable}.
- */
-public abstract class AbstractErrorHandler implements ProfileHandler {
-
-    /** Servlet request attribute to which the error is bound. */
-    public static final String ERROR_KEY = "error";
-    
-    /** {@inheritDoc} */
-    public abstract void processRequest(InTransport in, OutTransport out);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/NoProfileHandlerException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/NoProfileHandlerException.java.svn-base
deleted file mode 100644
index 3ecac91..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/NoProfileHandlerException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile;
-
-/**
- * A profile exception thrown when there are no profile handlers available to response to a given request.
- */
-public class NoProfileHandlerException extends ProfileException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3013701738036863294L;
-
-    /**
-     * Constructor.
-     */
-    public NoProfileHandlerException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public NoProfileHandlerException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public NoProfileHandlerException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public NoProfileHandlerException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileException.java.svn-base
deleted file mode 100644
index 8bcf620..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethException;
-
-/** Exception for errors occurring within a profile handler. */
-public class ProfileException extends ShibbolethException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 4583295620520286941L;
-
-    /**
-     * Constructor.
-     */
-    public ProfileException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public ProfileException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public ProfileException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public ProfileException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileHandler.java.svn-base
deleted file mode 100644
index 1d6f917..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileHandler.java.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile;
-
-import org.opensaml.ws.transport.InTransport;
-import org.opensaml.ws.transport.OutTransport;
-
-/**
- * Basic interfaces for classes that handler incoming requests.
- * 
- * @param <InTransportType> inbound transport type
- * @param <OutTransportType> outbount transport type
- */
-public interface ProfileHandler<InTransportType extends InTransport, OutTransportType extends OutTransport> {
-
-    /**
-     * Processes an incoming request.
-     * 
-     * @param inTransport the incoming request transport
-     * @param outTransport the outgoing response transport
-     * 
-     * @throws ProfileException throw if there was a problem while processing the request
-     */
-    public void processRequest(InTransportType inTransport, OutTransportType outTransport) throws ProfileException;
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileHandlerManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileHandlerManager.java.svn-base
deleted file mode 100644
index b977b70..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileHandlerManager.java.svn-base
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile;
-
-import javax.servlet.ServletRequest;
-
-/**
- * This manager is responsible for determining the correct {@link ProfileHandler} for a given request. The
- * manner in which this is done is completely implementation specific but implementers should make the selection process
- * as quick and simple as absolutely possible as this process will be run on every request.
- */
-public interface ProfileHandlerManager {
-
-    /**
-     * Gets the profile handler to service this request.
-     * 
-     * @param request request that will be serviced by the profile handler
-     * 
-     * @return the profile handler that should be used to service the given request
-     */
-    public ProfileHandler getProfileHandler(ServletRequest request);
-    
-    /**
-     * Gets the error handler for this manager.
-     * 
-     * @return handler to use if an error is encountered when processing a request
-     */
-    public AbstractErrorHandler getErrorHandler();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileRequestContext.java.svn-base
deleted file mode 100644
index b11f231..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileRequestContext.java.svn-base
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile;
-
-import java.util.Collection;
-
-import org.opensaml.ws.message.MessageContext;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.session.Session;
-
-/**
- * Extension to the basic message conext that carries profile request specific information.
- * 
- * @param <ProfileConfigurationType> profile configuration type for current request
- */
-public interface ProfileRequestContext<ProfileConfigurationType extends ProfileConfiguration> extends MessageContext {
-
-    /**
-     * Gets the configuration for the profile for the relying party.
-     * 
-     * @return configuration for the profile for the relying party
-     */
-    public ProfileConfigurationType getProfileConfiguration();
-
-    /**
-     * Gets the configuration for the relying party for this request.
-     * 
-     * @return configuration for the relying party for this request
-     */
-    public RelyingPartyConfiguration getRelyingPartyConfiguration();
-
-    /**
-     * Gets the current user session, if there is one.
-     * 
-     * @return current user session
-     */
-    public Session getUserSession();
-
-    /**
-     * Sets the configuration for the profile for the relying party.
-     * 
-     * @param configuration configuration for the profile for the relying party
-     */
-    public void setProfileConfiguration(ProfileConfigurationType configuration);
-
-    /**
-     * Sets the configuration for the relying party for this request.
-     * 
-     * @param configuration configuration for the relying party for this request
-     */
-    public void setRelyingPartyConfiguration(RelyingPartyConfiguration configuration);
-
-    /**
-     * Sets the current user session.
-     * 
-     * @param session current user session
-     */
-    public void setUserSession(Session session);
-
-    /**
-     * Gets the attributes, by ID, released to the peer.
-     * 
-     * @return attributes released to the peer
-     */
-    public Collection<String> getReleasedAttributes();
-
-    /**
-     * Sets the attributes, by ID, released to the peer.
-     * 
-     * @param attributeIds ids of the attributes released to the peer
-     */
-    public void setReleasedAttributes(Collection<String> attributeIds);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileRequestDispatcherServlet.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileRequestDispatcherServlet.java.svn-base
deleted file mode 100644
index 8d7c221..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/.svn/text-base/ProfileRequestDispatcherServlet.java.svn-base
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile;
-
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.opensaml.ws.transport.http.HTTPInTransport;
-import org.opensaml.ws.transport.http.HTTPOutTransport;
-import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
-import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.log.AccessLogEntry;
-
-/**
- * Servlet responsible for dispatching incoming requests to the appropriate {@link ProfileHandler}.
- */
-public class ProfileRequestDispatcherServlet extends HttpServlet {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3750548606378986211L;
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ProfileRequestDispatcherServlet.class);
-
-    /** Access logger. */
-    private final Logger accessLog = LoggerFactory.getLogger(AccessLogEntry.ACCESS_LOGGER_NAME);
-
-    /** Profile handler manager. */
-    private ProfileHandlerManager handlerManager;
-
-    /** {@inheritDoc} */
-    public void init(ServletConfig config) throws ServletException {
-        super.init(config);
-
-        String handlerManagerId = config.getInitParameter("handlerManagerId");
-        if (DatatypeHelper.isEmpty(handlerManagerId)) {
-            handlerManagerId = "shibboleth.HandlerManager";
-        }
-
-        handlerManager = (ProfileHandlerManager) getServletContext().getAttribute(handlerManagerId);
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("unchecked")
-    protected void service(HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws ServletException,
-            IOException {
-        if (accessLog.isInfoEnabled()) {
-            AccessLogEntry accessEntry = new AccessLogEntry(httpRequest);
-            accessLog.info(accessEntry.toString());
-        }
-
-        HTTPInTransport profileReq = new HttpServletRequestAdapter(httpRequest);
-        HTTPOutTransport profileResp = new HttpServletResponseAdapter(httpResponse, httpRequest.isSecure());
-
-        AbstractErrorHandler errorHandler = handlerManager.getErrorHandler();
-        ProfileHandler handler = handlerManager.getProfileHandler(httpRequest);
-        if (handler != null) {
-            try {
-                handler.processRequest(profileReq, profileResp);
-                return;
-            }catch(ProfileException e){
-                httpRequest.setAttribute(AbstractErrorHandler.ERROR_KEY, e);
-            } catch (Throwable t) {
-                log.error("Error occurred while processing request", t);
-            }
-        } else {
-            log.warn("No profile handler configured for request at path: {}", httpRequest.getPathInfo());
-            httpRequest.setAttribute(AbstractErrorHandler.ERROR_KEY, new NoProfileHandlerException(
-                    "No profile handler configured for request at path: " + httpRequest.getPathInfo()));
-        }
-
-        errorHandler.processRequest(profileReq, profileResp);
-        return;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/all-wcprops
deleted file mode 100644
index b87f745..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 120
-/java-shib-common/!svn/ver/1043/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider
-END
-JSPErrorHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 140
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/JSPErrorHandler.java
-END
-AbstractShibbolethProfileHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 157
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/AbstractShibbolethProfileHandler.java
-END
-BaseSAMLProfileRequestContext.java
-K 25
-svn:wc:ra_dav:version-url
-V 154
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/BaseSAMLProfileRequestContext.java
-END
-VelocityErrorHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 146
-/java-shib-common/!svn/ver/1043/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/VelocityErrorHandler.java
-END
-SAMLProfileRequestContext.java
-K 25
-svn:wc:ra_dav:version-url
-V 150
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/SAMLProfileRequestContext.java
-END
-AbstractRequestURIMappedProfileHandler.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/AbstractRequestURIMappedProfileHandler.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/entries
deleted file mode 100644
index 90dbecd..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/entries
+++ /dev/null
@@ -1,232 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-19T19:32:02.965811Z
-1043
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAMLProfileRequestContext.java
-file
-
-
-
-
-2014-02-19T17:27:41.010744Z
-26f0a427b64c1ed52bdd105e66063a55
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2046
-

-AbstractRequestURIMappedProfileHandler.java
-file
-
-
-
-
-2014-02-19T17:27:41.010744Z
-bbce14f412bf7d1f3a402eeb7652f90e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2356
-

-JSPErrorHandler.java
-file
-
-
-
-
-2014-02-19T17:27:41.010744Z
-65bcdaaa7466ab9dad01af133e87fe5d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3386
-

-AbstractShibbolethProfileHandler.java
-file
-
-
-
-
-2014-02-19T17:27:41.010744Z
-979fa43e4489962e2fab29d281bcda63
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6953
-

-BaseSAMLProfileRequestContext.java
-file
-
-
-
-
-2014-02-19T17:27:41.010744Z
-ae425fa912b13981dbb4ff82c0275ba8
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7434
-

-VelocityErrorHandler.java
-file
-
-
-
-
-2014-02-19T17:27:41.010744Z
-ce0245c2c6260c33f422e49ebab84096
-2012-11-19T19:32:02.965811Z
-1043
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4265
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/AbstractRequestURIMappedProfileHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/AbstractRequestURIMappedProfileHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/AbstractRequestURIMappedProfileHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/AbstractShibbolethProfileHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/AbstractShibbolethProfileHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/AbstractShibbolethProfileHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/BaseSAMLProfileRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/BaseSAMLProfileRequestContext.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/BaseSAMLProfileRequestContext.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/JSPErrorHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/JSPErrorHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/JSPErrorHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/SAMLProfileRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/SAMLProfileRequestContext.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/SAMLProfileRequestContext.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/VelocityErrorHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/VelocityErrorHandler.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/prop-base/VelocityErrorHandler.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/AbstractRequestURIMappedProfileHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/AbstractRequestURIMappedProfileHandler.java.svn-base
deleted file mode 100644
index 7a43213..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/AbstractRequestURIMappedProfileHandler.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.ws.transport.InTransport;
-import org.opensaml.ws.transport.OutTransport;
-
-import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
-
-/**
- * A request handler that is associated with a list of request URI, as defined by the HTTP servlet request.
- * 
- * @param <InTransportType> inbound transport type
- * @param <OutTransportType> outbount transport type
- */
-public abstract class AbstractRequestURIMappedProfileHandler<InTransportType extends InTransport, OutTransportType extends OutTransport>
-        implements ProfileHandler<InTransportType, OutTransportType> {
-
-    /** Request paths that to which this profile handler will respond. */
-    private List<String> requestPaths;
-
-    /** Constructor. */
-    protected AbstractRequestURIMappedProfileHandler() {
-        requestPaths = new ArrayList<String>();
-    }
-
-    /**
-     * Gets the request paths that to which this profile handler will respond.
-     * 
-     * @return request paths that to which this profile handler will respond
-     */
-    public List<String> getRequestPaths() {
-        return requestPaths;
-    }
-
-    /**
-     * Sets the request paths that to which this profile handler will respond.
-     * 
-     * @param paths request paths that to which this profile handler will respond
-     */
-    public void setRequestPaths(List<String> paths) {
-        requestPaths = paths;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/AbstractShibbolethProfileHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/AbstractShibbolethProfileHandler.java.svn-base
deleted file mode 100644
index 330f8d1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/AbstractShibbolethProfileHandler.java.svn-base
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile.provider;
-
-import org.opensaml.Configuration;
-import org.opensaml.util.storage.StorageService;
-import org.opensaml.ws.transport.http.HTTPInTransport;
-import org.opensaml.ws.transport.http.HTTPOutTransport;
-import org.opensaml.xml.XMLObjectBuilderFactory;
-import org.opensaml.xml.parse.ParserPool;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfigurationManager;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.SAMLMDRelyingPartyConfigurationManager;
-import edu.internet2.middleware.shibboleth.common.session.Session;
-import edu.internet2.middleware.shibboleth.common.session.SessionManager;
-
-/**
- * A processor for a communication profile supported by Shibboleth.
- * 
- * Profile handlers must be stateless and thread-safe as a single instance may be used to service every incoming
- * request.
- * 
- * @param <RPManagerType> type of relying party configuration manager used by this profile handler
- * @param <SessionType> type of sessions managed by the session manager used by this profile handler
- */
-public abstract class AbstractShibbolethProfileHandler<RPManagerType extends SAMLMDRelyingPartyConfigurationManager, SessionType extends Session>
-        extends AbstractRequestURIMappedProfileHandler<HTTPInTransport, HTTPOutTransport> {
-
-    /** Pool of XML parsers. */
-    private ParserPool parserPool;
-    
-    /** Profile storage service. */
-    private StorageService<?, ?> storageService;
-    
-    /** Relying party configuration manager for the profile handler. */
-    private RPManagerType rpManager;
-
-    /** Session manager for the profile handler. */
-    private SessionManager<SessionType> sessionManager;
-
-    /** For building XML. */
-    private XMLObjectBuilderFactory builderFactory;
-
-    /** Constructor. */
-    protected AbstractShibbolethProfileHandler() {
-        super();
-        builderFactory = Configuration.getBuilderFactory();
-    }
-
-    /**
-     * Gets the ID of the profile supported by this handler.
-     * 
-     * @return ID of the profile supported by this handler
-     */
-    public abstract String getProfileId();
-    
-    /**
-     * Gets the pool of XML parsers.
-     * 
-     * @return pool of XML parsers.
-     */
-    public ParserPool getParserPool() {
-        return parserPool;
-    }
-    
-    /**
-     * Sets the pool of XML parsers.
-     * 
-     * @param pool pool of XML parsers
-     */
-    public void setParserPool(ParserPool pool) {
-        parserPool = pool;
-    }
-    
-    /**
-     * Gets the storage service used to store profile data.
-     * 
-     * @return storage service used to store profile data
-     */
-    public StorageService<?, ?> getStorageService() {
-        return storageService;
-    }
-    
-    /**
-     * Sets the storage service used to store profile data.
-     * 
-     * @param service storage service used to store profile data
-     */
-    public void setStorageService(StorageService<?, ?> service) {
-        storageService = service;
-    }
-
-    /**
-     * Gets the relying party manager for this profile handler.
-     * 
-     * @return relying party manager for this profile handler
-     */
-    public RPManagerType getRelyingPartyConfigurationManager() {
-        return rpManager;
-    }
-
-    /**
-     * Sets the relying party manager for this profile handler.
-     * 
-     * @param manager relying party manager for this profile handler
-     */
-    public void setRelyingPartyConfigurationManager(RPManagerType manager) {
-        rpManager = manager;
-    }
-
-    /**
-     * Gets the relying party configuration for the given entity. This is only a convenience method and is equivalent to
-     * retrieving the relying party configuration by invoking {@link #getRelyingPartyConfigurationManager()} and then
-     * invoking {@link RelyingPartyConfigurationManager#getRelyingPartyConfiguration(String)}.
-     * 
-     * @param relyingPartyId ID of the relying party
-     * 
-     * @return the relying party configuration or null
-     */
-    public RelyingPartyConfiguration getRelyingPartyConfiguration(String relyingPartyId) {
-        RelyingPartyConfigurationManager rpcManager = getRelyingPartyConfigurationManager();
-        if (rpcManager != null) {
-            return rpcManager.getRelyingPartyConfiguration(relyingPartyId);
-        }
-        
-        return null;
-    }
-
-    /**
-     * Gets the profile configuration for the given entity and profile Id. This is only a convenience method and is
-     * equivalent to retrieving the relying party configuration by invoking
-     * {@link #getRelyingPartyConfiguration(String)} following by
-     * {@link RelyingPartyConfiguration#getProfileConfiguration(String)}
-     * 
-     * @param relyingPartyId ID of the relying party
-     * @param profileId unique ID of the profile
-     * 
-     * @return the profile configuration or null
-     */
-    public ProfileConfiguration getProfileConfiguration(String relyingPartyId, String profileId) {
-        RelyingPartyConfiguration rpConfig = getRelyingPartyConfiguration(relyingPartyId);
-        if (rpConfig != null) {
-            return rpConfig.getProfileConfigurations().get(profileId);
-        }
-
-        return null;
-    }
-
-    /**
-     * Gets the session manager for this profile handler.
-     * 
-     * @return session manager for this profile handler
-     */
-    public SessionManager<SessionType> getSessionManager() {
-        return sessionManager;
-    }
-
-    /**
-     * Sets the session manager for this profile handler.
-     * 
-     * @param manager session manager for this profile handler
-     */
-    public void setSessionManager(SessionManager<SessionType> manager) {
-        sessionManager = manager;
-    }
-
-    /**
-     * Convenience method for getting the XML object builder factory.
-     * 
-     * @return XML object builder factory
-     */
-    public XMLObjectBuilderFactory getBuilderFactory() {
-        return builderFactory;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/BaseSAMLProfileRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/BaseSAMLProfileRequestContext.java.svn-base
deleted file mode 100644
index 3ded00b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/BaseSAMLProfileRequestContext.java.svn-base
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile.provider;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.opensaml.common.SAMLObject;
-import org.opensaml.common.binding.BasicSAMLMessageContext;
-import org.opensaml.common.binding.decoding.SAMLMessageDecoder;
-import org.opensaml.common.binding.encoding.SAMLMessageEncoder;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.session.Session;
-
-/**
- * Contextual object used to accumlate information as profile requests are being processed.
- * 
- * @param <InboundMessage> type of inbound SAML message
- * @param <OutboundMessage> type of outbound SAML message
- * @param <NameIdentifierType> type of name identifier used for subjects
- * @param <ProfileConfigurationType> profile configuration type for current request
- */
-public class BaseSAMLProfileRequestContext<InboundMessage extends SAMLObject, OutboundMessage extends SAMLObject, NameIdentifierType extends SAMLObject, ProfileConfigurationType extends ProfileConfiguration>
-        extends BasicSAMLMessageContext<InboundMessage, OutboundMessage, NameIdentifierType> implements
-        SAMLProfileRequestContext<InboundMessage, OutboundMessage, NameIdentifierType, ProfileConfigurationType> {
-
-    /** Decoder used to decode inbound message. */
-    private SAMLMessageDecoder messageDecoder;
-
-    /** Encoder used to encode outbound message. */
-    private SAMLMessageEncoder messageEncoder;
-
-    /** Attributes retrieved for the principal. */
-    private Map<String, BaseAttribute> principalAttributes;
-
-    /** Authentication method used to authenticate the principal. */
-    private String principalAuthenticationMethod;
-
-    /** Principal name of the subject of the request. */
-    private String principalName;
-
-    /** Attribute encoded as the SAML name identifier. */
-    private BaseAttribute nameIdentifierAttribute;
-
-    /** Configuration for the profile. */
-    private ProfileConfigurationType profileConfiguration;
-
-    /** IDs of attribute released to relying party. */
-    private Collection<String> releasedAttributeIds;
-
-    /** Configuration for the relying party. */
-    private RelyingPartyConfiguration relyingPartyConfiguration;
-
-    /** IDs of attribute requested by relaying party. */
-    private Collection<String> requestedAttributeIds;
-
-    /** Current user's session. */
-    private Session userSession;
-
-    /** {@inheritDoc} */
-    public Map<String, BaseAttribute> getAttributes() {
-        return principalAttributes;
-    }
-
-    /**
-     * Gets the message decoder used to decode the message from the inbound transport.
-     * 
-     * @return message decoder used to decode the message from the inbound transport
-     */
-    public SAMLMessageDecoder getMessageDecoder() {
-        return messageDecoder;
-    }
-
-    /**
-     * Gets the message encoder used to encoder the message onto the outbound transport.
-     * 
-     * @return message encoder used to encoder the message onto the outbound transport
-     */
-    public SAMLMessageEncoder getMessageEncoder() {
-        return messageEncoder;
-    }
-
-    /**
-     * Gets the attribute encoded as the SAML name identifier.
-     * 
-     * @return attribute encoded as the SAML name identifier
-     */
-    public BaseAttribute getNameIdentifierAttribute() {
-        return nameIdentifierAttribute;
-    }
-
-    /** {@inheritDoc} */
-    public String getPrincipalAuthenticationMethod() {
-        return principalAuthenticationMethod;
-    }
-
-    /** {@inheritDoc} */
-    public String getPrincipalName() {
-        return principalName;
-    }
-
-    /**
-     * Gets the configuration for the profile for the relying party.
-     * 
-     * @return configuration for the profile for the relying party
-     */
-    public ProfileConfigurationType getProfileConfiguration() {
-        return profileConfiguration;
-    }
-
-    /** {@inheritDoc} */
-    public Collection<String> getReleasedAttributes() {
-        return releasedAttributeIds;
-    }
-
-    /** {@inheritDoc} */
-    public RelyingPartyConfiguration getRelyingPartyConfiguration() {
-        return relyingPartyConfiguration;
-    }
-
-    /** {@inheritDoc} */
-    public Collection<String> getRequestedAttributesIds() {
-        return requestedAttributeIds;
-    }
-
-    /** {@inheritDoc} */
-    public Session getUserSession() {
-        return userSession;
-    }
-
-    /** {@inheritDoc} */
-    public void setAttributes(Map<String, BaseAttribute> attributes) {
-        principalAttributes = attributes;
-    }
-
-    /**
-     * Sets the message decoder used to decode the message from the inbound transport.
-     * 
-     * @param decoder message decoder used to decode the message from the inbound transport
-     */
-    public void setMessageDecoder(SAMLMessageDecoder decoder) {
-        messageDecoder = decoder;
-    }
-
-    /**
-     * Sets the message encoder used to encoder the message onto the outbound transport.
-     * 
-     * @param encoder message encoder used to encoder the message onto the outbound transport
-     */
-    public void setMessageEncoder(SAMLMessageEncoder encoder) {
-        messageEncoder = encoder;
-    }
-
-    /**
-     * Sets the attribute encoded as the SAML name identifier.
-     * 
-     * @param attribute attribute encoded as the SAML name identifier
-     */
-    public void setNameIdentifierAttribute(BaseAttribute attribute) {
-        nameIdentifierAttribute = attribute;
-    }
-
-    /** {@inheritDoc} */
-    public void setPrincipalAuthenticationMethod(String method) {
-        principalAuthenticationMethod = method;
-    }
-
-    /** {@inheritDoc} */
-    public void setPrincipalName(String name) {
-        principalName = name;
-    }
-
-    /** {@inheritDoc} */
-    public void setProfileConfiguration(ProfileConfigurationType configuration) {
-        profileConfiguration = configuration;
-    }
-
-    /** {@inheritDoc} */
-    public void setReleasedAttributes(Collection<String> attributeIds) {
-        releasedAttributeIds = attributeIds;
-    }
-
-    /** {@inheritDoc} */
-    public void setRelyingPartyConfiguration(RelyingPartyConfiguration configuration) {
-        relyingPartyConfiguration = configuration;
-    }
-
-    /** {@inheritDoc} */
-    public void setRequestedAttributes(Collection<String> ids) {
-        requestedAttributeIds = ids;
-    }
-
-    /** {@inheritDoc} */
-    public void setUserSession(Session session) {
-        userSession = session;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/JSPErrorHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/JSPErrorHandler.java.svn-base
deleted file mode 100644
index f4ce4d5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/JSPErrorHandler.java.svn-base
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile.provider;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.opensaml.ws.transport.InTransport;
-import org.opensaml.ws.transport.OutTransport;
-import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
-import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.profile.AbstractErrorHandler;
-
-/**
- * An error handler that forwards information to a JSP page for display to the end user.
- * 
- * The path to the JSP page provided to this handler may be absolute (i.e. start with a "/"), in which case the path is
- * assumed to be from the root of the servlet context, or relative, in which case the page is assumed to be relative
- * from the request dispatcher location. Deployers are strongly encouraged to use absolute paths.
- * 
- * The following request attributes are available to the JSP page:
- * 
- * <table>
- * <th>
- * <td>Attribute Name</td>
- * <td>Object Type</td>
- * <td>Value</td>
- * </th>
- * <tr>
- * <td>requestError</td>
- * <td>{@link Throwable}</td>
- * <td>Error that was thrown that triggered the invocation of this handler. </td>
- * </tr>
- * </table>
- */
-public class JSPErrorHandler extends AbstractErrorHandler {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(JSPErrorHandler.class);
-
-    /** Path to JSP page. */
-    private String jspPage;
-
-    /**
-     * Constructor.
-     * 
-     * @param page path to JSP page
-     */
-    public JSPErrorHandler(String page) {
-        jspPage = DatatypeHelper.safeTrimOrNullString(page);
-        if (jspPage == null) {
-            throw new IllegalArgumentException("JSP Error page may not be null.");
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void processRequest(InTransport in, OutTransport out) {
-        HttpServletRequest httpRequest = ((HttpServletRequestAdapter)in).getWrappedRequest();
-        HttpServletResponse httpResponse = ((HttpServletResponseAdapter)out).getWrappedResponse();
-        
-        RequestDispatcher dispatcher = httpRequest.getRequestDispatcher(jspPage);
-        try {
-            dispatcher.forward(httpRequest, httpResponse);
-            return;
-        } catch (Throwable t) {
-            log.error("Could not dispatch to error JSP page: " + jspPage, t);
-            return;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/SAMLProfileRequestContext.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/SAMLProfileRequestContext.java.svn-base
deleted file mode 100644
index 705ff0a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/SAMLProfileRequestContext.java.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile.provider;
-
-import org.opensaml.common.SAMLObject;
-import org.opensaml.common.binding.SAMLMessageContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.AttributeRequestContext;
-import edu.internet2.middleware.shibboleth.common.profile.ProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
-
-/**
- * Marker interface that combines profile and attribute request and SAML message contexts. *
- * 
- * @param <InboundMessageType> type of inbound SAML message
- * @param <OutboundMessageType> type of outbound SAML message
- * @param <NameIdentifierType> type of name identifier used for subjects
- * @param <ProfileConfigurationType> profile configuration type for current request
- */
-public interface SAMLProfileRequestContext<InboundMessageType extends SAMLObject, OutboundMessageType extends SAMLObject, NameIdentifierType extends SAMLObject, ProfileConfigurationType extends ProfileConfiguration>
-        extends SAMLMessageContext<InboundMessageType, OutboundMessageType, NameIdentifierType>,
-        ProfileRequestContext<ProfileConfigurationType>, AttributeRequestContext {
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/VelocityErrorHandler.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/VelocityErrorHandler.java.svn-base
deleted file mode 100644
index b02ec02..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/profile/provider/.svn/text-base/VelocityErrorHandler.java.svn-base
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.profile.provider;
-
-import java.io.OutputStreamWriter;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.opensaml.ws.transport.InTransport;
-import org.opensaml.ws.transport.OutTransport;
-import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
-import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.owasp.esapi.ESAPI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.profile.AbstractErrorHandler;
-
-/**
- * An error handler that render an error page by means of evaluating a Velocity template..
- * 
- * The following attributes are available within the velocity context page:
- * 
- * <table>
- * <th>
- * <td>Attribute Name</td>
- * <td>Object Type</td>
- * <td>Value</td>
- * </th>
- * <tr>
- * <td>requestError</td>
- * <td>{@link Throwable}</td>
- * <td>Error that was thrown that triggered the invocation of this handler. </td>
- * </tr>
- * </table>
- */
-public class VelocityErrorHandler extends AbstractErrorHandler {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(VelocityErrorHandler.class);
-
-    /** Velocity engine used to render error page. */
-    private VelocityEngine velocityEngine;
-
-    /** Location of the template to use to render the error page. */
-    private String templatePath;
-
-    /**
-     * Constructor.
-     * 
-     * @param engine engine used to render error page
-     * @param template classpath location of template used to render error page
-     */
-    public VelocityErrorHandler(VelocityEngine engine, String template) {
-        if (engine == null) {
-            log.error("Velocity engine may not be null");
-            throw new IllegalArgumentException("Velocity engine may not be null");
-        }
-        velocityEngine = engine;
-
-        templatePath = DatatypeHelper.safeTrimOrNullString(template);
-        if (templatePath == null) {
-            log.error("Velocity template path may not be null or empty");
-            throw new IllegalArgumentException("Velocity template path may not be null or empty");
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void processRequest(InTransport in, OutTransport out) {
-        VelocityContext context = new VelocityContext();
-        context.put("request", ((HttpServletRequestAdapter) in).getWrappedRequest());
-        context.put("requestError", in.getAttribute(AbstractErrorHandler.ERROR_KEY));
-        context.put("encoder", ESAPI.encoder());
-
-        HttpServletResponse response = ((HttpServletResponseAdapter) out).getWrappedResponse();
-        response.setContentType("text/html");
-        response.setHeader("Cache-Control", "content=\"no-store,no-cache,must-revalidate\"");
-        response.setHeader("Pragma","no-cache");
-        response.setHeader("Expires","-1");
-
-        try {
-            OutputStreamWriter responseWriter = new OutputStreamWriter(out.getOutgoingStream());
-            Template template = velocityEngine.getTemplate(templatePath);
-            template.merge(context, responseWriter);
-            responseWriter.flush();
-        } catch (Throwable t) {
-            log.error("Unable to evaluate velocity error template", t);
-        }
-
-        return;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/all-wcprops
deleted file mode 100644
index 7f7ba86..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 116
-/java-shib-common/!svn/ver/1060/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty
-END
-RelyingPartyConfigurationManager.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/RelyingPartyConfigurationManager.java
-END
-RelyingPartyConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 146
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/RelyingPartyConfiguration.java
-END
-RelyingPartySecurityPolicyResolver.java
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/RelyingPartySecurityPolicyResolver.java
-END
-ProfileConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/ProfileConfiguration.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/entries
deleted file mode 100644
index ef291b0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/entries
+++ /dev/null
@@ -1,167 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-08T19:26:10.353043Z
-1060
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-provider
-dir
-

-RelyingPartyConfigurationManager.java
-file
-
-
-
-
-2014-02-19T17:27:45.790837Z
-d75d436b5cc5786f0fb886461d90dfb6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2101
-

-RelyingPartyConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.790837Z
-1462e4dc3aa9daa7c63271f973a7e0ff
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6363
-

-RelyingPartySecurityPolicyResolver.java
-file
-
-
-
-
-2014-02-19T17:27:45.790837Z
-438dd74ca0369ecdb225f4ee73163881
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3286
-

-ProfileConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.790837Z
-c18e3f86cd7a8af9f72cc58e72111dd8
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1404
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/ProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/ProfileConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/ProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartyConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartyConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartyConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartyConfigurationManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartyConfigurationManager.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartyConfigurationManager.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartySecurityPolicyResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartySecurityPolicyResolver.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/prop-base/RelyingPartySecurityPolicyResolver.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/ProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/ProfileConfiguration.java.svn-base
deleted file mode 100644
index 3e72874..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/ProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty;
-
-import org.opensaml.ws.security.SecurityPolicy;
-
-/**
- * Configuration options for a specific communication profile.
- */
-public interface ProfileConfiguration {
-
-    /**
-     * Gets the unique identifier of the profile.
-     * 
-     * @return unique identifier of the profile
-     */
-    public String getProfileId();
-    
-    /**
-     * Gets the security policy for this profile.
-     * 
-     * @return security policy for this profile
-     */
-    public SecurityPolicy getSecurityPolicy();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartyConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartyConfiguration.java.svn-base
deleted file mode 100644
index 89ebb36..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartyConfiguration.java.svn-base
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.opensaml.xml.security.credential.Credential;
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * A set of configuration options for a relying party.
- */
-public class RelyingPartyConfiguration {
-
-    /** Entity ID of the relying party. */
-    private String relyingPartyId;
-
-    /** Entity ID of the responder when communicating with the relying party. */
-    private String providerId;
-
-    /** Authentication method to use if none is specified within a request. */
-    private String defaultAuthenticationMethod;
-
-    /** Default signing credential. */
-    private Credential signingCredential;
-
-    /** Precedence ordering of NameID formats for this relying party. */
-    private String[] nameIdFormatPrecedence;
-
-    /** Various profile configurations. */
-    private HashMap<String, ProfileConfiguration> profiles;
-
-    /**
-     * Constructor.
-     * 
-     * @param provider entity ID of the responder when communicating with the relying party
-     */
-    public RelyingPartyConfiguration(String provider) {
-        setProviderId(provider);
-        profiles = new HashMap<String, ProfileConfiguration>();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param relyingParty ID of the relying party this configuration is for
-     * @param provider entity ID of the responder when communicating with the relying party
-     */
-    public RelyingPartyConfiguration(String relyingParty, String provider) {
-        setRelyingPartyId(relyingParty);
-        setProviderId(provider);
-        profiles = new HashMap<String, ProfileConfiguration>();
-    }
-
-    /**
-     * Gets the precedence of NameID formats for this relying party.
-     * 
-     * @return precedence of NameID formats for this relying party
-     */
-    public String[] getNameIdFormatPrecedence() {
-        return nameIdFormatPrecedence;
-    }
-
-    /**
-     * Sets the precedence of NameID formats for this relying party.
-     * 
-     * @param precedence precedence of NameID formats for this relying party
-     */
-    public void setNameIdFormatPrecedence(String[] precedence) {
-        nameIdFormatPrecedence = precedence;
-    }
-
-    /**
-     * Gets the entity ID of the relying party this configuration is for.
-     * 
-     * @return the entity ID of the relying party this configuration is for
-     */
-    public String getRelyingPartyId() {
-        return relyingPartyId;
-    }
-
-    /**
-     * Sets the entity ID of the relying party this configuration is for.
-     * 
-     * @param id entity ID of the relying party this configuration is for
-     */
-    protected void setRelyingPartyId(String id) {
-        relyingPartyId = DatatypeHelper.safeTrimOrNullString(id);
-    }
-
-    /**
-     * Gets the entity ID of the responder when communicating with the relying party.
-     * 
-     * @return entity ID of the responder when communicating with the relying party
-     */
-    public String getProviderId() {
-        return providerId;
-    }
-
-    /**
-     * Sets the entity ID of the responder when communicating with the relying party.
-     * 
-     * @param id entity ID of the responder when communicating with the relying party
-     */
-    protected void setProviderId(String id) {
-        providerId = DatatypeHelper.safeTrimOrNullString(id);
-    }
-
-    /**
-     * Gets the authentication method to use if one is not specified within a request.
-     * 
-     * @return authentication method to use if one is not specified within a request
-     */
-    public String getDefaultAuthenticationMethod() {
-        return defaultAuthenticationMethod;
-    }
-
-    /**
-     * Sets the authentication method to use if one is not specified within a request.
-     * 
-     * @param method authentication method to use if one is not specified within a request
-     */
-    public void setDefaultAuthenticationMethod(String method) {
-        defaultAuthenticationMethod = method;
-    }
-
-    /**
-     * Gets the default signing credential for the relying party. This is provided as a convenience method so that this
-     * credential need not be defined on every signing supporting profile configuration. If a profile configuration has
-     * a defined signing credential it must be used in place of the credential retrieved here.
-     * 
-     * @return default signing credential for the relying party
-     */
-    public Credential getDefaultSigningCredential() {
-        return signingCredential;
-    }
-
-    /**
-     * Sets the default signing credential for the relying party.
-     * 
-     * @param credential default signing credential for the relying party
-     */
-    public void setDefaultSigningCredential(Credential credential) {
-        signingCredential = credential;
-    }
-
-    /**
-     * Gets whether assertions should be encrypted.
-     * 
-     * @return configuration for specific communication profiles used by the system indexed by profile ID
-     */
-    public Map<String, ProfileConfiguration> getProfileConfigurations() {
-        return profiles;
-    }
-
-    /**
-     * Convenience method for retrieving a given profile configuration from the {@link Map} returned by
-     * {@link #getProfileConfigurations()}.
-     * 
-     * @param profileId unique Id of the profile
-     * 
-     * @return the profile configuration or null
-     */
-    public ProfileConfiguration getProfileConfiguration(String profileId) {
-        if (profiles != null) {
-            return profiles.get(profileId);
-        }
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartyConfigurationManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartyConfigurationManager.java.svn-base
deleted file mode 100644
index 28f1d18..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartyConfigurationManager.java.svn-base
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty;
-
-import java.util.Map;
-
-/**
- * Locates the configuration for a given relying party.
- */
-public interface RelyingPartyConfigurationManager {
-
-    /**
-     * Gets the configuration for the given relying party.
-     * 
-     * @param relyingPartyEntityID the entity of the relying part to get the configuration for
-     * 
-     * @return configuration for the given relying party
-     */
-    public RelyingPartyConfiguration getRelyingPartyConfiguration(String relyingPartyEntityID);
-
-    /**
-     * Gets the registered relying party configurations indexed by relying party ID.
-     * 
-     * @return the registered relying party configurations
-     */
-    public Map<String, RelyingPartyConfiguration> getRelyingPartyConfigurations();
-
-    /**
-     * Gets the default relying party configuration.
-     * 
-     * @return the default relying party configuration
-     */
-    public RelyingPartyConfiguration getDefaultRelyingPartyConfiguration();
-
-    /**
-     * Gets the relying party configuration to use for anonymous parties.
-     * 
-     * @return the relying party configuration to use for anonymous parties
-     */
-    public RelyingPartyConfiguration getAnonymousRelyingConfiguration();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartySecurityPolicyResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartySecurityPolicyResolver.java.svn-base
deleted file mode 100644
index 56e63b6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/.svn/text-base/RelyingPartySecurityPolicyResolver.java.svn-base
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty;
-
-import java.util.Collections;
-
-import org.opensaml.ws.message.MessageContext;
-import org.opensaml.ws.security.SecurityPolicy;
-import org.opensaml.ws.security.SecurityPolicyResolver;
-import org.opensaml.xml.security.SecurityException;
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * A security policy resolver that selects the active security policy based on the inbound message issuer ID and the
- * communication profile used.
- */
-public class RelyingPartySecurityPolicyResolver implements SecurityPolicyResolver {
-
-    /** Relying party configuration manager. */
-    private RelyingPartyConfigurationManager rpConfigManager;
-
-    /**
-     * Constructor.
-     * 
-     * @param configManager configuration manager used to resolve relying party specific configuration information, may
-     *            not be null
-     */
-    public RelyingPartySecurityPolicyResolver(RelyingPartyConfigurationManager configManager) {
-        if (configManager == null) {
-            throw new IllegalArgumentException("Relying party configuraiton manager may not be null");
-        }
-        
-        rpConfigManager = configManager;
-    }
-
-    /** {@inheritDoc} */
-    public Iterable<SecurityPolicy> resolve(MessageContext messageContext) throws SecurityException {
-        return Collections.singletonList(resolveSingle(messageContext));
-    }
-
-    /** {@inheritDoc} */
-    public SecurityPolicy resolveSingle(MessageContext messageContext) throws SecurityException {
-        String peerEntityId = messageContext.getInboundMessageIssuer();
-        if (DatatypeHelper.isEmpty(peerEntityId)) {
-            throw new SecurityException(
-                    "Unable to select security policy, ID of the peer unknown.");
-        }
-
-        RelyingPartyConfiguration rpConfig = rpConfigManager.getRelyingPartyConfiguration(peerEntityId);
-        if (rpConfig == null) {
-            return null;
-        }
-
-        String profileId = messageContext.getCommunicationProfileId();
-        if (DatatypeHelper.isEmpty(profileId)) {
-            throw new SecurityException(
-                    "Unable to select security policy, communication profile ID unknown.");
-        }
-
-        ProfileConfiguration profileConfig = rpConfig.getProfileConfiguration(profileId);
-        if (profileConfig == null) {
-            return null;
-        }
-
-        return profileConfig.getSecurityPolicy();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/all-wcprops
deleted file mode 100644
index ef0fd24..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 125
-/java-shib-common/!svn/ver/1060/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider
-END
-AbstractSAMLProfileConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/1060/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/AbstractSAMLProfileConfiguration.java
-END
-CryptoOperationRequirementLevel.java
-K 25
-svn:wc:ra_dav:version-url
-V 161
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/CryptoOperationRequirementLevel.java
-END
-SAMLMDRelyingPartyConfigurationManager.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/1008/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/SAMLMDRelyingPartyConfigurationManager.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/entries
deleted file mode 100644
index c1e3258..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/entries
+++ /dev/null
@@ -1,136 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-08T19:26:10.353043Z
-1060
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AbstractSAMLProfileConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-3a077121844096223cbcb0b8800e8991
-2013-03-08T19:26:10.353043Z
-1060
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6988
-

-CryptoOperationRequirementLevel.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-bb47b906708e3682722580e8a6cc8c40
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1365
-

-SAMLMDRelyingPartyConfigurationManager.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-56bde8b4d9796a5a96ca6de2160f5a4b
-2011-10-09T14:27:35.639655Z
-1008
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9215
-

-saml1
-dir
-

-saml2
-dir
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/AbstractSAMLProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/AbstractSAMLProfileConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/AbstractSAMLProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/CryptoOperationRequirementLevel.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/CryptoOperationRequirementLevel.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/CryptoOperationRequirementLevel.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/SAMLMDRelyingPartyConfigurationManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/SAMLMDRelyingPartyConfigurationManager.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/prop-base/SAMLMDRelyingPartyConfigurationManager.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/AbstractSAMLProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/AbstractSAMLProfileConfiguration.java.svn-base
deleted file mode 100644
index 5be5244..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/AbstractSAMLProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider;
-
-import java.util.Collection;
-
-import org.opensaml.ws.security.SecurityPolicy;
-import org.opensaml.xml.security.credential.Credential;
-import org.opensaml.xml.util.LazySet;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
-
-/**
- * Profile settings common to SAML 1 and SAML 2.
- */
-public abstract class AbstractSAMLProfileConfiguration implements ProfileConfiguration {
-    
-    /** Audiences for the assertion. */
-    private Collection<String> assertionAudiences;
-
-    /** Life of the assertion in milliseconds. */
-    private long assertionLifetime;
-
-    /** Whether assertions should include a NotBefore condition. */
-    private boolean includeConditionsNotBefore;
-
-    /** 2-byte artifact type used on outbound messages. */
-    private byte[] outboundArtifactType;
-
-    /** Security policy for this profile. */
-    private SecurityPolicy profileSecurityPolicy;
-
-    /** Whether to sign assertions. */
-    private CryptoOperationRequirementLevel signAssertions;
-
-    /** Assertion signing credential. */
-    private Credential signingCredential;
-
-    /** Whether to sign protocol requests. */
-    private CryptoOperationRequirementLevel signRequests;
-
-    /** Whether to sign protocol responses. */
-    private CryptoOperationRequirementLevel signResponses;
-
-    /** Constructor. */
-    protected AbstractSAMLProfileConfiguration() {
-        assertionAudiences = new LazySet<String>();
-    }
-
-    /**
-     * Gets the list of audiences an assertion is intended for.
-     * 
-     * @return list of audiences an assertion is intended for
-     */
-    public Collection<String> getAssertionAudiences() {
-        return assertionAudiences;
-    }
-
-    /**
-     * Gets the lifetime, in millisecond, for an issued assertion.
-     * 
-     * This value should be used to compute the NotOnOrAfter condition.
-     * 
-     * @return lifetime, in millisecond, for an issued assertion
-     */
-    public long getAssertionLifetime() {
-        return assertionLifetime;
-    }
-
-    /**
-     * Gets whether assertions should include a NotBefore condition.
-     *
-     * @return whether assertions should include a NotBefore condition
-     */
-    public boolean includeConditionsNotBefore() {
-        return includeConditionsNotBefore;
-    }
-
-    /**
-     * Gets the 2-byte artifact type used on outbound messages.
-     * 
-     * @return 2-byte artifact type used on outbound messages
-     */
-    public byte[] getOutboundArtifactType() {
-        return outboundArtifactType;
-    }
-
-    /** {@inheritDoc} */
-    public SecurityPolicy getSecurityPolicy() {
-        return profileSecurityPolicy;
-    }
-
-    /**
-     * Gets whether assertions should be signed.
-     * 
-     * @return whether assertions should be signed
-     */
-    public CryptoOperationRequirementLevel getSignAssertions() {
-        return signAssertions;
-    }
-
-    /**
-     * Gets the credential that should be used to sign a message.
-     * 
-     * @return credential that should be used to sign a message
-     */
-    public Credential getSigningCredential() {
-        return signingCredential;
-    }
-
-    /**
-     * Gets whether to sign protocol requests.
-     * 
-     * @return whether to sign protocol requests
-     */
-    public CryptoOperationRequirementLevel getSignRequests() {
-        return signRequests;
-    }
-
-    /**
-     * Gets whether to sign protocol responses.
-     * 
-     * @return whether to sign protocol responses
-     */
-    public CryptoOperationRequirementLevel getSignResponses() {
-        return signResponses;
-    }
-
-    /**
-     * Sets the list of audiences an assertion is intended for.
-     * 
-     * @param audiences list of audiences an assertion is intended for
-     */
-    public void setAssertionAudiences(Collection<String> audiences) {
-        assertionAudiences = audiences;
-    }
-
-    /**
-     * Sets the lifetime, in millisecond, for an issued assertion.
-     * 
-     * @param lifetime lifetime, in millisecond, for an issued assertion
-     */
-    public void setAssertionLifetime(long lifetime) {
-        assertionLifetime = lifetime;
-    }
-
-    /**
-     * Sets whether assertions should include a NotBefore condition.
-     *
-     * @param include whether assertions should include a NotBefore condition
-     */
-    public void setIncludeConditionsNotBefore(boolean include) {
-        includeConditionsNotBefore = include;
-    }
-
-    /**
-     * Sets the 2-byte artifact type used on outbound messages.
-     * 
-     * @param type 2-byte artifact type used on outbound messages.
-     */
-    public void setOutboundArtifactType(byte[] type) {
-        outboundArtifactType = type;
-    }
-
-    /**
-     * Sets the security policy for this profile.
-     * 
-     * @param policy security policy for this profile
-     */
-    public void setSecurityPolicy(SecurityPolicy policy) {
-        profileSecurityPolicy = policy;
-    }
-
-    /**
-     * Sets whether assertions should be signed.
-     * 
-     * @param sign whether assertions should be signed
-     */
-    public void setSignAssertions(CryptoOperationRequirementLevel sign) {
-        signAssertions = sign;
-    }
-
-    /**
-     * Gets the credential that should be used for sign a message. Credential <strong>MUST</strong> include a private
-     * key.
-     * 
-     * @param credential credential that should be used for sign a message
-     */
-    public void setSigningCredential(Credential credential) {
-        if (credential != null && credential.getPrivateKey() == null) {
-            throw new IllegalArgumentException("Credential does not contain a private key");
-        }
-        signingCredential = credential;
-    }
-
-    /**
-     * Sets whether to sign protocol requests.
-     * 
-     * @param sign whether to sign protocol requests
-     */
-    public void setSignRequests(CryptoOperationRequirementLevel sign) {
-        signRequests = sign;
-    }
-
-    /**
-     * Sets whether to sign protocol responses.
-     * 
-     * @param sign whether to sign protocol responses
-     */
-    public void setSignResponses(CryptoOperationRequirementLevel sign) {
-        signResponses = sign;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/CryptoOperationRequirementLevel.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/CryptoOperationRequirementLevel.java.svn-base
deleted file mode 100644
index 70fd962..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/CryptoOperationRequirementLevel.java.svn-base
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider;
-
-/** Indicates the requirement level for crypto operations like signing and encryption. */
-public enum CryptoOperationRequirementLevel{
-    /** Indicates that the operation must always be performed. */
-    always, 
-    
-    /** Indicates that the operation should only be performed if the binding/transport does not provide equivalent protection. */
-    conditional, 
-    
-    /** Indicates the operation should never be performed.*/
-    never
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/SAMLMDRelyingPartyConfigurationManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/SAMLMDRelyingPartyConfigurationManager.java.svn-base
deleted file mode 100644
index 1730388..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/.svn/text-base/SAMLMDRelyingPartyConfigurationManager.java.svn-base
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.locks.Lock;
-
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml2.metadata.provider.BaseMetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProviderException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseReloadableService;
-import edu.internet2.middleware.shibboleth.common.config.relyingparty.RelyingPartyGroup;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfigurationManager;
-import edu.internet2.middleware.shibboleth.common.service.ServiceException;
-
-/**
- * A relying party manager that uses SAML metadata to lookup information about requested entities. Relying party
- * configuration information is looked up as follows:
- * 
- * If the given entity ID is null, empty, or contains only whitespace the anonymous relying party configuration is
- * returned. Otherwise, the given relying party entity ID is looked for in the list of registered
- * {@link RelyingPartyConfiguration}s and if found is returned. If no configuration is registered for the specific
- * entity ID the entity descriptor for the relying party is located using the {@link MetadataProvider}. The name of
- * ancestral entities descriptors are then looked up, in ascending order (i.e. the parent entities descriptor, then the
- * grandparent, great-grandparent, etc.), with the first configuration found being returned. If no configuration is
- * found once the top of the tree is reached the default configuration is returned.
- */
-public class SAMLMDRelyingPartyConfigurationManager extends BaseReloadableService implements
-        RelyingPartyConfigurationManager {
-
-    /** ID used for anonymous relying party. */
-    public static final String ANONYMOUS_RP_NAME = "anonymous";
-
-    /** ID used for default relying party. */
-    public static final String DEFAULT_RP_NAME = "default";
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SAMLMDRelyingPartyConfigurationManager.class);
-
-    /** Metadata provider used to lookup information about entities. */
-    private MetadataProvider metadataProvider;
-
-    /** Registered relying party configurations. */
-    private HashMap<String, RelyingPartyConfiguration> rpConfigs;
-
-    /** Constructor. */
-    public SAMLMDRelyingPartyConfigurationManager() {
-        super();
-        rpConfigs = new HashMap<String, RelyingPartyConfiguration>();
-    }
-
-    /** {@inheritDoc} */
-    public RelyingPartyConfiguration getAnonymousRelyingConfiguration() {
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        try {
-            return rpConfigs.get(ANONYMOUS_RP_NAME);
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-    /** {@inheritDoc} */
-    public RelyingPartyConfiguration getDefaultRelyingPartyConfiguration() {
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        try {
-            return rpConfigs.get(DEFAULT_RP_NAME);
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-    /**
-     * Gets the metadata provider used to lookup information about entities.
-     * 
-     * @return metadata provider used to lookup information about entities
-     */
-    public MetadataProvider getMetadataProvider() {
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        try {
-            return metadataProvider;
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-    /**
-     * Sets the metadata provider used to lookup information about entities.
-     * 
-     * @param provider metadata provider used to lookup information about entities
-     */
-    public void setMetadataProvider(MetadataProvider provider) {
-        metadataProvider = provider;
-    }
-
-    /** {@inheritDoc} */
-    public RelyingPartyConfiguration getRelyingPartyConfiguration(String relyingPartyEntityID) {
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-
-        try {
-            log.debug("Looking up relying party configuration for {}", relyingPartyEntityID);
-            if (rpConfigs.containsKey(relyingPartyEntityID)) {
-                log.debug("Custom relying party configuration found for {}", relyingPartyEntityID);
-                return rpConfigs.get(relyingPartyEntityID);
-            }
-
-            log.debug("No custom relying party configuration found for {}, looking up configuration based on metadata groups.",
-                            relyingPartyEntityID);
-            try {
-                if (metadataProvider == null) {
-                    log.debug("No metadata provider available, unable to lookup configuration based on entity group");
-                } else {
-                    EntityDescriptor entityDescriptor = metadataProvider.getEntityDescriptor(relyingPartyEntityID);
-                    if (entityDescriptor != null) {
-                        EntitiesDescriptor entityGroup = (EntitiesDescriptor) entityDescriptor.getParent();
-                        while (entityGroup != null) {
-                            if (rpConfigs.containsKey(entityGroup.getName())) {
-                                log.debug("Relying party configuration found for {} as member of metadata group {}",
-                                        relyingPartyEntityID, entityGroup.getName());
-                                return rpConfigs.get(entityGroup.getName());
-                            }
-                            entityGroup = (EntitiesDescriptor) entityGroup.getParent();
-                        }
-                    }
-                }
-            } catch (MetadataProviderException e) {
-                log.error("Error fetching metadata for relying party " + relyingPartyEntityID, e);
-            }
-
-            log.debug("No custom or group-based relying party configuration found for {}. Using default relying party configuration.",
-                    relyingPartyEntityID);
-            return getDefaultRelyingPartyConfiguration();
-        } finally {
-            readLock.unlock();
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Map<String, RelyingPartyConfiguration> getRelyingPartyConfigurations() {
-        return rpConfigs;
-    }
-
-    /** {@inheritDoc} */
-    protected void onNewContextCreated(ApplicationContext newServiceContext) throws ServiceException {
-        MetadataProvider oldProvider = metadataProvider;
-        HashMap<String, RelyingPartyConfiguration> oldRpConfigs = rpConfigs;
-        try {
-            String[] relyingPartyGroupNames = newServiceContext.getBeanNamesForType(RelyingPartyGroup.class);
-            RelyingPartyGroup newRpGroup = (RelyingPartyGroup) newServiceContext.getBean(relyingPartyGroupNames[0]);
-
-            metadataProvider = newRpGroup.getMetadataProvider();
-
-            HashMap<String, RelyingPartyConfiguration> newRpConfigs = new HashMap<String, RelyingPartyConfiguration>();
-            List<RelyingPartyConfiguration> loadRpConfigs = newRpGroup.getRelyingParties();
-            if (loadRpConfigs != null) {
-                for (RelyingPartyConfiguration newRpConfig : loadRpConfigs) {
-                    newRpConfigs.put(newRpConfig.getRelyingPartyId(), newRpConfig);
-                    log.debug("Registering configuration for relying party: {}", newRpConfig.getRelyingPartyId());
-                }
-            }
-            newRpConfigs.put(ANONYMOUS_RP_NAME, newRpGroup.getAnonymousRP());
-            newRpConfigs.put(DEFAULT_RP_NAME, newRpGroup.getDefaultRP());
-            rpConfigs = newRpConfigs;
-            
-            if(oldProvider instanceof BaseMetadataProvider){
-                ((BaseMetadataProvider)oldProvider).destroy();
-            }
-        } catch (Exception e) {
-            metadataProvider = oldProvider;
-            rpConfigs = oldRpConfigs;
-            throw new ServiceException(getId() + " configuration is not valid, retaining old configuration", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/all-wcprops
deleted file mode 100644
index 398242d..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 130
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1
-END
-ShibbolethSSOConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/ShibbolethSSOConfiguration.java
-END
-AttributeQueryConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/AttributeQueryConfiguration.java
-END
-ArtifactResolutionConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/ArtifactResolutionConfiguration.java
-END
-AbstractSAML1ProfileConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/AbstractSAML1ProfileConfiguration.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/entries
deleted file mode 100644
index b6ca462..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/entries
+++ /dev/null
@@ -1,164 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibbolethSSOConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.774837Z
-882d3c984a7c999e4ca38ca275689d09
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2110
-

-AttributeQueryConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.774837Z
-fc460cae8ba3b75511414e55aa2e37c6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1318
-

-ArtifactResolutionConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.774837Z
-b802a075cc163498eeba55890d6294a2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1320
-

-AbstractSAML1ProfileConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.774837Z
-e4a2666da67c082dd664b00b6dd38e00
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1848
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/AbstractSAML1ProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/AbstractSAML1ProfileConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/AbstractSAML1ProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/ArtifactResolutionConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/ArtifactResolutionConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/ArtifactResolutionConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/AttributeQueryConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/AttributeQueryConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/AttributeQueryConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/ShibbolethSSOConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/ShibbolethSSOConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/prop-base/ShibbolethSSOConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/AbstractSAML1ProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/AbstractSAML1ProfileConfiguration.java.svn-base
deleted file mode 100644
index 1cf693a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/AbstractSAML1ProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML1AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.AbstractSAMLProfileConfiguration;
-
-/**
- * SAML 1 communication profile configuration settings.
- */
-public abstract class AbstractSAML1ProfileConfiguration extends AbstractSAMLProfileConfiguration {
-
-    /** Attribute authority to use. */
-    private SAML1AttributeAuthority attributeAuthority;
-    
-    /**
-     * Gets the Attribute authority to use.
-     * 
-     * @return Attribute authority to use
-     */
-    public SAML1AttributeAuthority getAttributeAuthority(){
-        return attributeAuthority;
-    }
-    
-    /**
-     * Sets the Attribute authority to use.
-     * 
-     * @param authority Attribute authority to use
-     */
-    public void setAttributeAuthority(SAML1AttributeAuthority authority){
-        attributeAuthority = authority;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/ArtifactResolutionConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/ArtifactResolutionConfiguration.java.svn-base
deleted file mode 100644
index ed68123..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/ArtifactResolutionConfiguration.java.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1;
-
-/**
- * SAML 1 Artifact Query configuration settings.
- */
-public class ArtifactResolutionConfiguration extends AbstractSAML1ProfileConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:mace:shibboleth:2.0:profiles:saml1:query:artifact";
-    
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/AttributeQueryConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/AttributeQueryConfiguration.java.svn-base
deleted file mode 100644
index a962d3a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/AttributeQueryConfiguration.java.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1;
-
-/**
- * SAML 1 Attribute Query configuration settings.
- */
-public class AttributeQueryConfiguration extends AbstractSAML1ProfileConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:mace:shibboleth:2.0:profiles:saml1:query:attribute";
-    
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/ShibbolethSSOConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/ShibbolethSSOConfiguration.java.svn-base
deleted file mode 100644
index 624ef5c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml1/.svn/text-base/ShibbolethSSOConfiguration.java.svn-base
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml1;
-
-/**
- * Shibboleth 1 SSO configuration settings.
- */
-public class ShibbolethSSOConfiguration extends AbstractSAML1ProfileConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:mace:shibboleth:2.0:profiles:saml1:sso";
-
-    /** Whether responses to the authentication request should include an attribute statement. */
-    private boolean includeAttributeStatement;
-
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-
-    /**
-     * Gets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @return whether responses to the authentication request should include an attribute statement
-     */
-    public boolean includeAttributeStatement() {
-        return includeAttributeStatement;
-    }
-
-    /**
-     * Sets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @param include whether responses to the authentication request should include an attribute statement
-     */
-    public void setIncludeAttributeStatement(boolean include) {
-        includeAttributeStatement = include;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/all-wcprops
deleted file mode 100644
index 91a0863..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 131
-/java-shib-common/!svn/ver/1059/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2
-END
-ECPConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 152
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/ECPConfiguration.java
-END
-AttributeQueryConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/AttributeQueryConfiguration.java
-END
-ArtifactResolutionConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/ArtifactResolutionConfiguration.java
-END
-LogoutRequestConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/LogoutRequestConfiguration.java
-END
-AbstractSAML2ProfileConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/AbstractSAML2ProfileConfiguration.java
-END
-SSOConfiguration.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/1059/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/SSOConfiguration.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/entries
deleted file mode 100644
index 48abc68..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/entries
+++ /dev/null
@@ -1,232 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-04T19:56:29.560315Z
-1059
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ArtifactResolutionConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-177b0146e707386778a12e73c3f468c8
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1325
-

-LogoutRequestConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-0677529f42f715185380922cf2de00ca
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1307
-

-AbstractSAML2ProfileConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-72f55c121992c85d9a9eca8ec77c3e34
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4165
-

-SSOConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-16c94517f33cbf91b05f50a04a831001
-2013-03-04T19:56:29.560315Z
-1059
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3911
-

-ECPConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-af4866121a7fcbf78d7b5e55934ea6de
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1362
-

-AttributeQueryConfiguration.java
-file
-
-
-
-
-2014-02-19T17:27:45.786837Z
-628567718329d3ed78c76e3f7685de82
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1318
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/AbstractSAML2ProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/AbstractSAML2ProfileConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/AbstractSAML2ProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/ArtifactResolutionConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/ArtifactResolutionConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/ArtifactResolutionConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/AttributeQueryConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/AttributeQueryConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/AttributeQueryConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/ECPConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/ECPConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/ECPConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/LogoutRequestConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/LogoutRequestConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/LogoutRequestConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/SSOConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/SSOConfiguration.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/prop-base/SSOConfiguration.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/AbstractSAML2ProfileConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/AbstractSAML2ProfileConfiguration.java.svn-base
deleted file mode 100644
index f461edc..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/AbstractSAML2ProfileConfiguration.java.svn-base
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2;
-
-import java.util.Collection;
-
-import org.opensaml.xml.util.LazySet;
-
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML2AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.AbstractSAMLProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.CryptoOperationRequirementLevel;
-
-/**
- * SAML 2 communication profile configuration settings.
- */
-public abstract class AbstractSAML2ProfileConfiguration extends AbstractSAMLProfileConfiguration {
-
-    /** Attribute authority to use. */
-    private SAML2AttributeAuthority attributeAuthority;
-
-    /** Whether to encrypt NameIDs. */
-    private CryptoOperationRequirementLevel encryptNameID;
-
-    /** Whether to encrypt Assertions. */
-    private CryptoOperationRequirementLevel encryptAssertion;
-
-    /** Maximum proxy count for an assertion. */
-    private int proxyCount;
-
-    /** Audiences for the proxy. */
-    private Collection<String> proxyAudiences;
-
-    /** Constructor. */
-    protected AbstractSAML2ProfileConfiguration() {
-        proxyAudiences = new LazySet<String>();
-    }
-
-    /**
-     * Gets the Attribute authority to use.
-     * 
-     * @return Attribute authority to use
-     */
-    public SAML2AttributeAuthority getAttributeAuthority() {
-        return attributeAuthority;
-    }
-
-    /**
-     * Sets the Attribute authority to use.
-     * 
-     * @param authority Attribute authority to use
-     */
-    public void setAttributeAuthority(SAML2AttributeAuthority authority) {
-        attributeAuthority = authority;
-    }
-
-    /**
-     * Gets whether NameIDs should be encrypted.
-     * 
-     * @return whether NameIDs should be encrypted
-     */
-    public CryptoOperationRequirementLevel getEncryptNameID() {
-        return encryptNameID;
-    }
-
-    /**
-     * Sets whether NameIDs should be encrypted.
-     * 
-     * @param encrypt whether NameIDs should be encrypted
-     */
-    public void setEncryptNameID(CryptoOperationRequirementLevel encrypt) {
-        encryptNameID = encrypt;
-    }
-
-    /**
-     * Gets whether assertions should be encrypted.
-     * 
-     * @return whether assertions should be encrypted
-     */
-    public CryptoOperationRequirementLevel getEncryptAssertion() {
-        return encryptAssertion;
-    }
-
-    /**
-     * Sets whether assertions should be encrypted.
-     * 
-     * @param encrypt whether assertions should be encrypted
-     */
-    public void setEncryptAssertion(CryptoOperationRequirementLevel encrypt) {
-        encryptAssertion = encrypt;
-    }
-
-    /**
-     * Gets the maximum number of times an assertion may be proxied.
-     * 
-     * @return maximum number of times an assertion may be proxied
-     */
-    public int getProxyCount() {
-        return proxyCount;
-    }
-
-    /**
-     * Gets the maximum number of times an assertion may be proxied.
-     * 
-     * @param count maximum number of times an assertion may be proxied
-     */
-    public void setProxyCount(int count) {
-        proxyCount = count;
-    }
-
-    /**
-     * Gets the audiences for a proxied assertion.
-     * 
-     * @return audiences for a proxied assertion
-     */
-    public Collection<String> getProxyAudiences() {
-        return proxyAudiences;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/ArtifactResolutionConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/ArtifactResolutionConfiguration.java.svn-base
deleted file mode 100644
index a3c1872..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/ArtifactResolutionConfiguration.java.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2;
-
-/**
- * SAML 2 Artifact Resolution configuration settings.
- */
-public class ArtifactResolutionConfiguration extends AbstractSAML2ProfileConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:mace:shibboleth:2.0:profiles:saml2:query:artifact";
-    
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/AttributeQueryConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/AttributeQueryConfiguration.java.svn-base
deleted file mode 100644
index d9013b0..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/AttributeQueryConfiguration.java.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2;
-
-/**
- * SAML 2 Attribute Query configuration settings.
- */
-public class AttributeQueryConfiguration extends AbstractSAML2ProfileConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:mace:shibboleth:2.0:profiles:saml2:query:attribute";
-    
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/ECPConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/ECPConfiguration.java.svn-base
deleted file mode 100644
index d704187..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/ECPConfiguration.java.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2;
-
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.SSOConfiguration;
-
-/** ECP SAML 2 SSO configuration settings. */
-public class ECPConfiguration extends SSOConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp";
-
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/LogoutRequestConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/LogoutRequestConfiguration.java.svn-base
deleted file mode 100644
index 50b31ed..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/LogoutRequestConfiguration.java.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2;
-
-/**
- * SAML 2 Logout Request configuration settings.
- */
-public class LogoutRequestConfiguration extends AbstractSAML2ProfileConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:mace:shibboleth:2.0:profiles:saml2:logout";
-    
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/SSOConfiguration.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/SSOConfiguration.java.svn-base
deleted file mode 100644
index 6036aa4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/saml2/.svn/text-base/SSOConfiguration.java.svn-base
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2;
-
-/** SAML 2 SSO configuration settings. */
-public class SSOConfiguration extends AbstractSAML2ProfileConfiguration {
-
-    /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "urn:mace:shibboleth:2.0:profiles:saml2:sso";
-
-    /** Whether responses to the authentication request should include an attribute statement. */
-    private boolean includeAttributeStatement;
-
-    /** The maximum amount of time, in milliseconds, the service provider should maintain a session for the user. */
-    private long maximumSPSessionLifetime;
-    
-    /** Whether to skip response location checks for signed requests. */
-    private boolean skipEndpointValidationWhenSigned;
-
-    /** {@inheritDoc} */
-    public String getProfileId() {
-        return PROFILE_ID;
-    }
-
-    /**
-     * Gets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @return whether responses to the authentication request should include an attribute statement
-     */
-    public boolean includeAttributeStatement() {
-        return includeAttributeStatement;
-    }
-
-    /**
-     * Sets whether responses to the authentication request should include an attribute statement.
-     * 
-     * @param include whether responses to the authentication request should include an attribute statement
-     */
-    public void setIncludeAttributeStatement(boolean include) {
-        includeAttributeStatement = include;
-    }
-
-    /**
-     * Gets the maximum amount of time, in milliseconds, the service provider should maintain a session for the user
-     * based on the authentication assertion. A value less than or equal to 0 is interpreted as an unlimited lifetime.
-     * 
-     * @return max lifetime of service provider should maintain a session
-     */
-    public long getMaximumSPSessionLifetime() {
-        return maximumSPSessionLifetime;
-    }
-
-    /**
-     * Sets the maximum amount of time, in milliseconds, the service provider should maintain a session for the user
-     * based on the authentication assertion. A value less than or equal to 0 is interpreted as an unlimited lifetime.
-     * 
-     * @param lifetime max lifetime of service provider should maintain a session
-     */
-    public void setMaximumSPSessionLifetime(long lifetime) {
-        if (lifetime < 1) {
-            maximumSPSessionLifetime = 0;
-        } else {
-            maximumSPSessionLifetime = lifetime;
-        }
-    }
-
-    /**
-     * Gets whether to bypass ACS checks for signed requests.
-     * @return  true iff ACS checking should be bypassed for signed requests
-     */
-    public boolean skipEndpointValidationWhenSigned() {
-        return skipEndpointValidationWhenSigned;
-    }
-    
-    /**
-     * Sets whether to bypass ACS checks for signed requests.
-     * @param flag  whether to bypass ACS checks for signed requests
-     */
-    public void setSkipEndpointValidationWhenSigned(boolean flag) {
-        skipEndpointValidationWhenSigned = flag;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/all-wcprops
deleted file mode 100644
index 4ce3381..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 111
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/resource
-END
-SVNResource.java
-K 25
-svn:wc:ra_dav:version-url
-V 128
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/resource/SVNResource.java
-END
-SVNBasicAuthenticationManager.java
-K 25
-svn:wc:ra_dav:version-url
-V 146
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/resource/SVNBasicAuthenticationManager.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/entries
deleted file mode 100644
index ef17fcb..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/resource
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SVNBasicAuthenticationManager.java
-file
-
-
-
-
-2014-02-19T17:27:45.294828Z
-6e962178eec86d661bee993d39ea5f64
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9324
-

-SVNResource.java
-file
-
-
-
-
-2014-02-19T17:27:45.294828Z
-6e6e4ede3da7404387c60d47988d9d48
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-15135
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNBasicAuthenticationManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNBasicAuthenticationManager.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNBasicAuthenticationManager.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNResource.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNResource.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNResource.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNBasicAuthenticationManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNBasicAuthenticationManager.java.svn-base
deleted file mode 100644
index 96d9cca..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNBasicAuthenticationManager.java.svn-base
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.resource;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.TrustManager;
-
-import net.jcip.annotations.ThreadSafe;
-
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.tmatesoft.svn.core.SVNErrorMessage;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
-import org.tmatesoft.svn.core.auth.ISVNAuthenticationProvider;
-import org.tmatesoft.svn.core.auth.ISVNProxyManager;
-import org.tmatesoft.svn.core.auth.SVNAuthentication;
-import org.tmatesoft.svn.core.io.SVNRepository;
-
-/** Authentication manager for SVN resources. */
- at ThreadSafe
-public class SVNBasicAuthenticationManager implements ISVNAuthenticationManager {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SVNBasicAuthenticationManager.class);
-
-    /** Network connection timeout in milliseconds. */
-    private int connectionTimeout;
-
-    /** Read operation timeout in milliseconds. */
-    private int readTimeout;
-
-    private TrustManager trustManager;
-
-    /** User authentication mechanisms. */
-    private Map<String, SVNAuthentication> authenticationMethods;
-
-    /** HTTP proxy configuration. */
-    private final BasicProxyManager proxyManager;
-
-    /**
-     * Constructor.
-     * 
-     * @param authnMethods user authentication methods
-     */
-    public SVNBasicAuthenticationManager(List<SVNAuthentication> authnMethods) {
-        connectionTimeout = 5000;
-        readTimeout = 10000;
-        setAuthenticationMethods(authnMethods);
-        proxyManager = null;
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param authnMethods user authentication methods
-     * @param proxyHost host name or IP address of the proxy server
-     * @param proxyPort port of the proxy server
-     * @param proxyUser username used to connect to the proxy server
-     * @param proxyPassword password used to connect to the proxy server
-     */
-    public SVNBasicAuthenticationManager(List<SVNAuthentication> authnMethods, String proxyHost, int proxyPort,
-            String proxyUser, String proxyPassword) {
-        connectionTimeout = 5000;
-        readTimeout = 10000;
-        setAuthenticationMethods(authnMethods);
-        proxyManager = new BasicProxyManager(proxyHost, proxyPort, proxyUser, proxyPassword);
-    }
-
-    /** {@inheritDoc} */
-    public void acknowledgeAuthentication(boolean authnAccepted, String authnKind, String authnRealm,
-            SVNErrorMessage error, SVNAuthentication authnMethods) throws SVNException {
-        if (authnAccepted) {
-            log.trace("Successful authentication to SVN repository with {} credentials", authnKind);
-        } else {
-            log.trace("Unable to authenticate to SVN repository with {} credentials", authnKind);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void acknowledgeTrustManager(TrustManager manager) {
-        log.debug("HTTPS connectiont trusted by trust manager");
-    }
-
-    /** {@inheritDoc} */
-    public int getConnectTimeout(SVNRepository repository) {
-        return connectionTimeout;
-    }
-
-    /**
-     * Sets the network connection timeout in milliseconds. If a value of zero or less is given than the value
-     * {@link Integer#MAX_VALUE} will be used.
-     * 
-     * @param timeout network connection timeout in milliseconds
-     */
-    public void setConnectionTimeout(int timeout) {
-        if (timeout <= 0) {
-            connectionTimeout = Integer.MAX_VALUE;
-        } else {
-            connectionTimeout = timeout;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public SVNAuthentication getFirstAuthentication(String authnKind, String authnRealm, SVNURL repository)
-            throws SVNException {
-        return authenticationMethods.get(authnKind);
-    }
-
-    /** {@inheritDoc} */
-    public SVNAuthentication getNextAuthentication(String authnKind, String authnRealm, SVNURL respository)
-            throws SVNException {
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public ISVNProxyManager getProxyManager(SVNURL repository) throws SVNException {
-        return proxyManager;
-    }
-
-    /** {@inheritDoc} */
-    public int getReadTimeout(SVNRepository repository) {
-        return readTimeout;
-    }
-
-    /**
-     * Sets the read operation timeout in milliseconds. If a value of zero or less is given than the value
-     * {@link Integer#MAX_VALUE} will be used.
-     * 
-     * @param timeout network connection timeout in milliseconds
-     */
-    public void setReadTimeout(int timeout) {
-        if (timeout <= 0) {
-            readTimeout = Integer.MAX_VALUE;
-        } else {
-            readTimeout = timeout;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public TrustManager getTrustManager(SVNURL respository) throws SVNException {
-        return trustManager;
-    }
-
-    /**
-     * Sets the trust manager used when negotiating SSL/TLS connections.
-     * 
-     * @param manager trust manager used when negotiating SSL/TLS connections
-     */
-    public void setTrustManager(TrustManager manager) {
-        trustManager = manager;
-    }
-
-    /** {@inheritDoc} */
-    public boolean isAuthenticationForced() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    public void setAuthenticationProvider(ISVNAuthenticationProvider arg0) {
-    }
-
-    /**
-     * Sets the user authentication methods.
-     * 
-     * @param authnMethods user authentication methods
-     */
-    private void setAuthenticationMethods(List<SVNAuthentication> authnMethods) {
-        if (authnMethods == null || authnMethods.size() == 0) {
-            authenticationMethods = Collections.emptyMap();
-        } else {
-            HashMap<String, SVNAuthentication> methods = new HashMap<String, SVNAuthentication>();
-            for (SVNAuthentication method : authnMethods) {
-                if (methods.containsKey(method.getKind())) {
-                    log.warn("An authentication method of type " + method.getKind()
-                            + " has already been set, only the first will be used");
-                } else {
-                    methods.put(method.getKind(), method);
-                }
-            }
-            authenticationMethods = Collections.unmodifiableMap(methods);
-        }
-    }
-
-    /** Basic implementation of {@link ISVNProxyManager}. */
-    private class BasicProxyManager implements ISVNProxyManager {
-
-        /** Host name or IP address of the proxy. */
-        private final String host;
-
-        /** Port of the proxy. */
-        private final int port;
-
-        /** Username used to connect to the proxy. */
-        private final String user;
-
-        /** Password used to connect to the proxy. */
-        private final String password;
-
-        /**
-         * Constructor.
-         * 
-         * @param host host name or IP address of the proxy server
-         * @param port port of the proxy server
-         * @param user username used to connect to the proxy server
-         * @param password password used to connect to the proxy server
-         */
-        public BasicProxyManager(String host, int port, String user, String password) {
-            this.host = DatatypeHelper.safeTrimOrNullString(host);
-            if (this.host == null) {
-                throw new IllegalArgumentException("Proxy host may not be null or empty");
-            }
-
-            this.port = port;
-
-            this.user = DatatypeHelper.safeTrimOrNullString(user);
-            this.password = DatatypeHelper.safeTrimOrNullString(password);
-        }
-
-        /** {@inheritDoc} */
-        public void acknowledgeProxyContext(boolean accepted, SVNErrorMessage error) {
-            if (accepted) {
-                log.trace("Connected to HTTP proxy " + host + ":" + port);
-            }
-            log.error("Unable to connect to HTTP proxy " + host + ":" + port + " recieved error:\n"
-                    + error.getFullMessage());
-        }
-
-        /** {@inheritDoc} */
-        public String getProxyHost() {
-            return host;
-        }
-
-        /** {@inheritDoc} */
-        public String getProxyPassword() {
-            return password;
-        }
-
-        /** {@inheritDoc} */
-        public int getProxyPort() {
-            return port;
-        }
-
-        /** {@inheritDoc} */
-        public String getProxyUserName() {
-            return user;
-        }
-    }
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNResource.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNResource.java.svn-base
deleted file mode 100644
index c662d60..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNResource.java.svn-base
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.resource;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.joda.time.DateTime;
-import org.opensaml.util.resource.AbstractFilteredResource;
-import org.opensaml.util.resource.ResourceException;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.tmatesoft.svn.core.SVNDepth;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
-import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNStatus;
-
-/**
- * A resource representing a file fetch from a Subversion server.
- * 
- * This resource will fetch the given resource as follows:
- * <ul>
- * <li>If the revision is a positive number the resource will fetch the resource once during construction time and will
- * never attempt to fetch it again.</li>
- * <li>If the revision number is zero or less, signaling the HEAD revision, every call this resource will cause the
- * resource to check to see if the current working copy is the same as the revision in the remote repository. If it is
- * not the new revision will be retrieved.</li>
- * </ul>
- * 
- * The behavior of multiple {@link SVNResource} operating on the same local copy are undefined.
- * 
- * @since 1.1
- */
-public class SVNResource extends AbstractFilteredResource {
-
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SVNResource.class);
-
-    /** SVN Client manager. */
-    private final SVNClientManager clientManager;
-
-    /** URL to the remote repository. */
-    private SVNURL remoteRepository;
-
-    /** Directory where the working copy will be kept. */
-    private File workingCopyDirectory;
-
-    /** Revision of the working copy. */
-    private SVNRevision retrievalRevision;
-
-    /** File, within the working copy, represented by this resource. */
-    private String resourceFileName;
-
-    /** Time the resource file was last modified. */
-    private DateTime lastModified;
-
-    /**
-     * Constructor.
-     * 
-     * @param svnClientMgr manager used to create SVN clients
-     * @param repositoryUrl URL of the remote repository
-     * @param workingCopy directory that will serve as the root of the local working copy
-     * @param workingRevision revision of the resource to retrieve or -1 for HEAD revision
-     * @param resourceFile file, within the working copy, represented by this resource
-     * 
-     * @throws ResourceException thrown if there is a problem initializing the SVN resource
-     */
-    public SVNResource(SVNClientManager svnClientMgr, SVNURL repositoryUrl, File workingCopy, long workingRevision,
-            String resourceFile) throws ResourceException {
-        DAVRepositoryFactory.setup();
-        SVNRepositoryFactoryImpl.setup();
-        FSRepositoryFactory.setup();
-        if (svnClientMgr == null) {
-            log.error("SVN client manager may not be null");
-            throw new IllegalArgumentException("SVN client manager may not be null");
-        }
-        clientManager = svnClientMgr;
-
-        if (repositoryUrl == null) {
-            throw new IllegalArgumentException("SVN repository URL may not be null");
-        }
-        remoteRepository = repositoryUrl;
-
-        try {
-            checkWorkingCopyDirectory(workingCopy);
-            workingCopyDirectory = workingCopy;
-        } catch (ResourceException e) {
-            throw new IllegalArgumentException(e.getMessage());
-        }
-
-        if (workingRevision < 0) {
-            this.retrievalRevision = SVNRevision.HEAD;
-        } else {
-            this.retrievalRevision = SVNRevision.create(workingRevision);
-        }
-
-        resourceFileName = DatatypeHelper.safeTrimOrNullString(resourceFile);
-        if (resourceFileName == null) {
-            log.error("SVN working copy resource file name may not be null or empty");
-            throw new IllegalArgumentException("SVN working copy resource file name may not be null or empty");
-        }
-
-        checkoutOrUpdateResource();
-        if (!getResourceFile().exists()) {
-            log.error("Resource file " + resourceFile + " does not exist in SVN working copy directory "
-                    + workingCopy.getAbsolutePath());
-            throw new ResourceException("Resource file " + resourceFile
-                    + " does not exist in SVN working copy directory " + workingCopy.getAbsolutePath());
-        }
-    }
-
-    /** {@inheritDoc} */
-    public boolean exists() throws ResourceException {
-        return getResourceFile().exists();
-    }
-
-    /** {@inheritDoc} */
-    public InputStream getInputStream() throws ResourceException {
-        checkoutOrUpdateResource();
-        try {
-            return applyFilter(new FileInputStream(getResourceFile()));
-        } catch (IOException e) {
-            String erroMsg = "Unable to read resource file " + resourceFileName + " from local working copy "
-                    + workingCopyDirectory.getAbsolutePath();
-            log.error(erroMsg, e);
-            throw new ResourceException(erroMsg, e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public DateTime getLastModifiedTime() throws ResourceException {
-        checkoutOrUpdateResource();
-        return lastModified;
-    }
-
-    /** {@inheritDoc} */
-    public String getLocation() {
-        return remoteRepository.toDecodedString() + "/" + resourceFileName;
-    }
-
-    /**
-     * Gets {@link File} for the resource.
-     * 
-     * @return file for the resource
-     * 
-     * @throws ResourceException thrown if there is a problem fetching the resource or checking on its status
-     */
-    protected File getResourceFile() throws ResourceException {
-        return new File(workingCopyDirectory, resourceFileName);
-    }
-
-    /**
-     * Checks that the given file exists, or can be created, is a directory, and is read/writable by this process.
-     * 
-     * @param directory the directory to check
-     * 
-     * @throws ResourceException thrown if the file is invalid
-     */
-    protected void checkWorkingCopyDirectory(File directory) throws ResourceException {
-        if (directory == null) {
-            log.error("SVN working copy directory may not be null");
-            throw new ResourceException("SVN working copy directory may not be null");
-        }
-
-        if (!directory.exists()) {
-            boolean created = directory.mkdirs();
-            if (!created) {
-                log.error("SVN working copy direction " + directory.getAbsolutePath()
-                        + " does not exist and could not be created");
-                throw new ResourceException("SVN working copy direction " + directory.getAbsolutePath()
-                        + " does not exist and could not be created");
-            }
-        }
-
-        if (!directory.isDirectory()) {
-            log.error("SVN working copy location " + directory.getAbsolutePath() + " is not a directory");
-            throw new ResourceException("SVN working copy location " + directory.getAbsolutePath()
-                    + " is not a directory");
-        }
-
-        if (!directory.canRead()) {
-            log.error("SVN working copy directory " + directory.getAbsolutePath() + " can not be read by this process");
-            throw new ResourceException("SVN working copy directory " + directory.getAbsolutePath()
-                    + " can not be read by this process");
-        }
-
-        if (!directory.canWrite()) {
-            log.error("SVN working copy directory " + directory.getAbsolutePath()
-                    + " can not be written to by this process");
-            throw new ResourceException("SVN working copy directory " + directory.getAbsolutePath()
-                    + " can not be written to by this process");
-        }
-    }
-
-    /**
-     * Checks out the resource specified by the {@link #remoteRepository} in to the working copy
-     * {@link #workingCopyDirectory}. If the working copy is empty than an SVN checkout is performed if the working copy
-     * already exists then an SVN update is performed.
-     * 
-     * @throws ResourceException thrown if there is a problem communicating with the remote repository, the revision
-     *             does not exist, or the working copy is unusable
-     */
-    protected void checkoutOrUpdateResource() throws ResourceException {
-        log.debug("checking out or updating working copy");
-        SVNRevision newRevision;
-
-        if (!workingCopyDirectoryExists()) {
-            log.debug("working copy does not yet exist, checking it out");
-            newRevision = checkoutResourceDirectory();
-        } else {
-            if (retrievalRevision != SVNRevision.HEAD) {
-                log.debug("Working copy exists and version is pegged at {}, no need to update",
-                        retrievalRevision.toString());
-                return;
-            }
-            log.debug("Working copy exists, updating to latest version.");
-            newRevision = updateResourceDirectory();
-        }
-
-        log.debug("Determing last modification date of revision {}", newRevision.getNumber());
-        lastModified = getLastModificationForRevision(newRevision);
-    }
-
-    /**
-     * Checks to see if the working copy directory exists.
-     * 
-     * @return true if the working copy directory exists, false otherwise
-     */
-    private boolean workingCopyDirectoryExists() {
-        File svnMetadataDir = new File(workingCopyDirectory, ".svn");
-        return svnMetadataDir.exists();
-    }
-
-    /**
-     * Fetches the content from the SVN repository and creates the local working copy.
-     * 
-     * @return the revision of the fetched content
-     * 
-     * @throws ResourceException thrown if there is a problem checking out the content from the repository
-     */
-    private SVNRevision checkoutResourceDirectory() throws ResourceException {
-        try {
-            long newRevision = clientManager.getUpdateClient().doCheckout(remoteRepository, workingCopyDirectory,
-                    retrievalRevision, retrievalRevision, SVNDepth.INFINITY, true);
-            log.debug(
-                    "Checked out revision {} from remote repository {} and stored it in local working directory {}",
-                    new Object[] { newRevision, remoteRepository.toDecodedString(),
-                            workingCopyDirectory.getAbsolutePath(), });
-            return SVNRevision.create(newRevision);
-        } catch (SVNException e) {
-            String errMsg = "Unable to check out revsion " + retrievalRevision.toString() + " from remote repository "
-                    + remoteRepository.toDecodedString() + " to local working directory "
-                    + workingCopyDirectory.getAbsolutePath();
-            log.error(errMsg, e);
-            throw new ResourceException(errMsg, e);
-        }
-    }
-
-    /**
-     * Updates an existing local working copy from the repository.
-     * 
-     * @return the revision of the fetched content
-     * 
-     * @throws ResourceException thrown if there is a problem updating the working copy
-     */
-    private SVNRevision updateResourceDirectory() throws ResourceException {
-        try {
-            long newRevision = clientManager.getUpdateClient().doUpdate(workingCopyDirectory, retrievalRevision,
-                    SVNDepth.INFINITY, true, true);
-            log.debug("Updated local working directory {} to revision {} from remote repository {}", new Object[] {
-                    workingCopyDirectory.getAbsolutePath(), newRevision, remoteRepository.toDecodedString(), });
-            return SVNRevision.create(newRevision);
-        } catch (SVNException e) {
-            String errMsg = "Unable to update working copy of resoure " + remoteRepository.toDecodedString()
-                    + " in working copy " + workingCopyDirectory.getAbsolutePath() + " to revsion "
-                    + retrievalRevision.toString();
-            log.error(errMsg, e);
-            throw new ResourceException(errMsg, e);
-        }
-    }
-
-    /**
-     * Gets the last modified time for the given revision.
-     * 
-     * @param revision revision to get the last modified date for
-     * 
-     * @return the last modified time
-     * 
-     * @throws ResourceException thrown if there is a problem getting the last modified time
-     */
-    private DateTime getLastModificationForRevision(SVNRevision revision) throws ResourceException {
-        try {
-            SVNStatusHandler handler = new SVNStatusHandler();
-            clientManager.getStatusClient().doStatus(getResourceFile(), revision, SVNDepth.INFINITY, true, true, false,
-                    false, handler, null);
-            SVNStatus status = handler.getStatus();
-
-            // remote revision is null when using a pegged version or when using HEAD and the version has not changed
-            if (status.getRemoteRevision() == null) {
-                return new DateTime(status.getCommittedDate());
-            } else {
-                return new DateTime(status.getRemoteDate());
-            }
-        } catch (SVNException e) {
-            String errMsg = "Unable to check status of resource " + resourceFileName + " within working directory "
-                    + workingCopyDirectory.getAbsolutePath();
-            log.error(errMsg, e);
-            throw new ResourceException(errMsg, e);
-        }
-    }
-
-    /** Simple {@link ISVNStatusHandler} implementation that just stores and returns the status. */
-    private class SVNStatusHandler implements ISVNStatusHandler {
-
-        /** Current status of the resource. */
-        private SVNStatus status;
-
-        /**
-         * Gets the current status of the resource.
-         * 
-         * @return current status of the resource
-         */
-        public SVNStatus getStatus() {
-            return status;
-        }
-
-        /** {@inheritDoc} */
-        public void handleStatus(SVNStatus currentStatus) throws SVNException {
-            status = currentStatus;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops
deleted file mode 100644
index 63d878a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 111
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/security
-END
-ShibbolethSecurityPolicy.java
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/security/ShibbolethSecurityPolicy.java
-END
-MetadataPKIXValidationInformationResolver.java
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/security/MetadataPKIXValidationInformationResolver.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/entries
deleted file mode 100644
index 2263f45..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibbolethSecurityPolicy.java
-file
-
-
-
-
-2014-02-19T17:27:45.386830Z
-1298be928e344ad222b345ea94feb8bd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1596
-

-MetadataPKIXValidationInformationResolver.java
-file
-
-
-
-
-2014-02-19T17:27:45.386830Z
-0c75cdbe0f80831ed3a734878069252e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-33437
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/MetadataPKIXValidationInformationResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/MetadataPKIXValidationInformationResolver.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/MetadataPKIXValidationInformationResolver.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/ShibbolethSecurityPolicy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/ShibbolethSecurityPolicy.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/ShibbolethSecurityPolicy.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/MetadataPKIXValidationInformationResolver.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/MetadataPKIXValidationInformationResolver.java.svn-base
deleted file mode 100644
index e2a99a4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/MetadataPKIXValidationInformationResolver.java.svn-base
+++ /dev/null
@@ -1,811 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.security;
-
-import java.lang.ref.SoftReference;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.saml2.common.Extensions;
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml2.metadata.KeyDescriptor;
-import org.opensaml.saml2.metadata.RoleDescriptor;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProviderException;
-import org.opensaml.saml2.metadata.provider.ObservableMetadataProvider;
-import org.opensaml.security.MetadataCriteria;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.security.CriteriaSet;
-import org.opensaml.xml.security.SecurityException;
-import org.opensaml.xml.security.credential.UsageType;
-import org.opensaml.xml.security.criteria.EntityIDCriteria;
-import org.opensaml.xml.security.criteria.UsageCriteria;
-import org.opensaml.xml.security.keyinfo.KeyInfoHelper;
-import org.opensaml.xml.security.x509.BasicPKIXValidationInformation;
-import org.opensaml.xml.security.x509.PKIXValidationInformation;
-import org.opensaml.xml.security.x509.PKIXValidationInformationResolver;
-import org.opensaml.xml.signature.KeyInfo;
-import org.opensaml.xml.signature.KeyName;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.LazySet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataKeyAuthority;
-
-/**
- * An implementation of {@link PKIXValidationInformationResolver} which resolves {@link PKIXValidationInformation} based
- * on information stored in SAML 2 metadata. Validation information is retrieved from Shibboleth-specific metadata
- * extensions to {@link EntityDescriptor} and {@link EntitiesDescriptor} elements, represented by instances of
- * {@link ShibbolethMetadataKeyAuthority}.
- * 
- * Resolution of trusted names for an entity is also supported, based on {@link KeyName} information contained within
- * the {@link KeyInfo} of a role descriptor's {@link KeyDescriptor} element.
- */
-public class MetadataPKIXValidationInformationResolver implements PKIXValidationInformationResolver {
-
-    /** Default value for Shibboleth KeyAuthority verify depth. */
-    public static final int KEY_AUTHORITY_VERIFY_DEPTH_DEFAULT = 1;
-    
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(MetadataPKIXValidationInformationResolver.class);
-
-    /** Metadata provider from which to fetch the credentials. */
-    private MetadataProvider metadata;
-
-    /** Cache of resolved info. [MetadataCacheKey, Credentials] */
-    private Map<MetadataCacheKey, SoftReference<List<PKIXValidationInformation>>> entityPKIXCache;
-
-    /** Cache of resolved info. [Extensions, Credentials] */
-    private Map<Extensions, SoftReference<List<PKIXValidationInformation>>> extensionsCache;
-
-    /** Cache of resolved info. [MetadataCacheKey, Strings(trusted key names)] */
-    private Map<MetadataCacheKey, SoftReference<Set<String>>> entityNamesCache;
-    
-    /** Lock used to synchronize access to the caches. */
-    private ReadWriteLock rwlock;
-
-    /**
-     * Constructor.
-     * 
-     * @param metadataProvider provider of the metadata
-     * 
-     * @throws IllegalArgumentException thrown if the supplied provider is null
-     */
-    public MetadataPKIXValidationInformationResolver(MetadataProvider metadataProvider) {
-        super();
-        if (metadataProvider == null) {
-            throw new IllegalArgumentException("Metadata provider may not be null");
-        }
-        metadata = metadataProvider;
-
-        entityPKIXCache = new HashMap<MetadataCacheKey, SoftReference<List<PKIXValidationInformation>>>();
-        extensionsCache = new HashMap<Extensions, SoftReference<List<PKIXValidationInformation>>>();
-        entityNamesCache = new HashMap<MetadataCacheKey, SoftReference<Set<String>>>();
-        
-        rwlock = new ReentrantReadWriteLock();
-
-        if (metadata instanceof ObservableMetadataProvider) {
-            ObservableMetadataProvider observable = (ObservableMetadataProvider) metadataProvider;
-            observable.getObservers().add(new MetadataProviderObserver());
-        }
-
-    }
-
-    /** {@inheritDoc} */
-    public PKIXValidationInformation resolveSingle(CriteriaSet criteriaSet) throws SecurityException {
-        Iterable<PKIXValidationInformation> pkixInfo = resolve(criteriaSet);
-        if (pkixInfo.iterator().hasNext()) {
-            return pkixInfo.iterator().next();
-        } else {
-            return null;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public Iterable<PKIXValidationInformation> resolve(CriteriaSet criteriaSet) throws SecurityException {
-
-        checkCriteriaRequirements(criteriaSet);
-
-        String entityID = criteriaSet.get(EntityIDCriteria.class).getEntityID();
-        MetadataCriteria mdCriteria = criteriaSet.get(MetadataCriteria.class);
-        QName role = mdCriteria.getRole();
-        String protocol = mdCriteria.getProtocol();
-        UsageCriteria usageCriteria = criteriaSet.get(UsageCriteria.class);
-        UsageType usage = null;
-        if (usageCriteria != null) {
-            usage = usageCriteria.getUsage();
-        } else {
-            usage = UsageType.UNSPECIFIED;
-        }
-        
-        // See Jira issue SIDP-229.
-        log.debug("Forcing on-demand metadata provider refresh if necessary");
-        try {
-            metadata.getMetadata();
-        } catch (MetadataProviderException e) {
-            // don't care about errors at this level
-        }
-
-        MetadataCacheKey cacheKey = new MetadataCacheKey(entityID, role, protocol, usage);
-        List<PKIXValidationInformation> pkixInfoSet = retrievePKIXInfoFromCache(cacheKey);
-
-        if (pkixInfoSet == null) {
-            pkixInfoSet = retrievePKIXInfoFromMetadata(entityID, role, protocol, usage);
-            cachePKIXInfo(cacheKey, pkixInfoSet);
-        }
-
-        return pkixInfoSet;
-    }
-
-    /** {@inheritDoc} */
-    public Set<String> resolveTrustedNames(CriteriaSet criteriaSet) throws SecurityException,
-            UnsupportedOperationException {
-
-        checkCriteriaRequirements(criteriaSet);
-
-        String entityID = criteriaSet.get(EntityIDCriteria.class).getEntityID();
-        MetadataCriteria mdCriteria = criteriaSet.get(MetadataCriteria.class);
-        QName role = mdCriteria.getRole();
-        String protocol = mdCriteria.getProtocol();
-        UsageCriteria usageCriteria = criteriaSet.get(UsageCriteria.class);
-        UsageType usage = null;
-        if (usageCriteria != null) {
-            usage = usageCriteria.getUsage();
-        } else {
-            usage = UsageType.UNSPECIFIED;
-        }
-        
-        // See Jira issue SIDP-229.
-        log.debug("Forcing on-demand metadata provider refresh if necessary");
-        try {
-            metadata.getMetadata();
-        } catch (MetadataProviderException e) {
-            // don't care about errors at this level
-        }
-
-        MetadataCacheKey cacheKey = new MetadataCacheKey(entityID, role, protocol, usage);
-        Set<String> trustedNames = retrieveTrustedNamesFromCache(cacheKey);
-
-        if (trustedNames == null) {
-            trustedNames = retrieveTrustedNamesFromMetadata(entityID, role, protocol, usage);
-            cacheTrustedNames(cacheKey, trustedNames);
-        }
-
-        return trustedNames;
-    }
-
-    /** {@inheritDoc} */
-    public boolean supportsTrustedNameResolution() {
-        return true;
-    }
-    
-    /**
-     * Get the lock instance used to synchronize access to the caches.
-     * 
-     * @return a read-write lock instance
-     */
-    protected ReadWriteLock getReadWriteLock() {
-        return rwlock;
-    }
-
-    /**
-     * Check that all necessary criteria are available.
-     * 
-     * @param criteriaSet the criteria set to evaluate
-     */
-    protected void checkCriteriaRequirements(CriteriaSet criteriaSet) {
-        EntityIDCriteria entityCriteria = criteriaSet.get(EntityIDCriteria.class);
-        MetadataCriteria mdCriteria = criteriaSet.get(MetadataCriteria.class);
-        if (entityCriteria == null) {
-            throw new IllegalArgumentException("Entity criteria must be supplied");
-        }
-        if (mdCriteria == null) {
-            throw new IllegalArgumentException("SAML metadata criteria must be supplied");
-        }
-        if (DatatypeHelper.isEmpty(entityCriteria.getEntityID())) {
-            throw new IllegalArgumentException("Entity ID criteria value must be supplied");
-        }
-        if (mdCriteria.getRole() == null) {
-            throw new IllegalArgumentException("Metadata role criteria value must be supplied");
-        }
-    }
-
-    /**
-     * Retrieves validation information from the provided metadata.
-     * 
-     * @param entityID entity ID for which to resolve validation information
-     * @param role role in which the entity is operating
-     * @param protocol protocol over which the entity is operating (may be null)
-     * @param usage usage specifier for role descriptor key descriptors to evaluate
-     * 
-     * @return collection of resolved validation information, possibly empty
-     * 
-     * @throws SecurityException thrown if the key, certificate, or CRL information is represented in an unsupported
-     *             format
-     */
-    protected List<PKIXValidationInformation> retrievePKIXInfoFromMetadata(String entityID, QName role,
-            String protocol, UsageType usage) throws SecurityException {
-
-        log.debug("Attempting to retrieve PKIX validation info from metadata for entity: {}", entityID);
-        List<PKIXValidationInformation> pkixInfoSet = new ArrayList<PKIXValidationInformation>();
-        
-        List<RoleDescriptor> roleDescriptors = getRoleDescriptors(entityID, role, protocol);
-        if(roleDescriptors == null || roleDescriptors.isEmpty()){
-            return pkixInfoSet;
-        }
-
-        for (RoleDescriptor roleDescriptor : roleDescriptors) {
-            List<PKIXValidationInformation> roleInfo = resolvePKIXInfo(roleDescriptor);
-            if (roleInfo != null && !roleInfo.isEmpty()) {
-                pkixInfoSet.addAll(roleInfo);
-            }
-        }
-
-        return pkixInfoSet;
-    }
-
-    /**
-     * Retrieves validation information from the provided role descriptor.
-     * 
-     * @param roleDescriptor the role descriptor from which to resolve information.
-     * @return collection of resolved validation information, possibly empty
-     * @throws SecurityException thrown if the key, certificate, or CRL information is represented in an unsupported
-     *             format
-     * 
-     */
-    protected List<PKIXValidationInformation> resolvePKIXInfo(RoleDescriptor roleDescriptor)
-            throws SecurityException {
-
-        List<PKIXValidationInformation> pkixInfoSet = new ArrayList<PKIXValidationInformation>();
-
-        XMLObject current = roleDescriptor.getParent();
-        while (current != null) {
-            if (current instanceof EntityDescriptor) {
-                pkixInfoSet.addAll(resolvePKIXInfo(((EntityDescriptor) current).getExtensions()));
-            } else if (current instanceof EntitiesDescriptor) {
-                pkixInfoSet.addAll(resolvePKIXInfo(((EntitiesDescriptor) current).getExtensions()));
-            }
-            current = current.getParent();
-        }
-        return pkixInfoSet;
-    }
-
-    /**
-     * Retrieves validation information from the metadata extension element.
-     * 
-     * @param extensions the extension element from which to resolve information
-     * @return collection of resolved validation information, possibly empty
-     * @throws SecurityException thrown if the key, certificate, or CRL information is represented in an unsupported
-     *             format
-     */
-    protected List<PKIXValidationInformation> resolvePKIXInfo(Extensions extensions) throws SecurityException {
-        if (extensions == null) {
-            return Collections.emptyList();
-        }
-
-        List<PKIXValidationInformation> pkixInfoSet = retrieveExtensionsInfoFromCache(extensions);
-        if (pkixInfoSet != null) {
-            return pkixInfoSet;
-        }
-        
-        if (log.isDebugEnabled()) {
-            String parentName = getExtensionsParentName(extensions);
-            if (parentName != null) {
-                if (extensions.getParent() instanceof EntityDescriptor) {
-                    log.debug("Resolving PKIX validation info for Extensions "
-                            + "with EntityDescriptor parent: {}", parentName);
-                } else  if (extensions.getParent() instanceof EntitiesDescriptor) {
-                    log.debug("Resolving PKIX validation info for Extensions " 
-                            + "with EntitiesDescriptor parent: {}", parentName);
-                }
-            } else {
-                log.debug("Resolving PKIX validation info for Extensions " 
-                        + "with unidentified parent");
-            }
-        }
-
-        pkixInfoSet = new ArrayList<PKIXValidationInformation>();
-        
-        List<XMLObject> authorities = 
-            extensions.getUnknownXMLObjects(ShibbolethMetadataKeyAuthority.DEFAULT_ELEMENT_NAME);
-        if (authorities == null || authorities.isEmpty()) {
-            return pkixInfoSet;
-        }
-        
-        for (XMLObject xmlObj : authorities) {
-            PKIXValidationInformation authoritySet = resolvePKIXInfo((ShibbolethMetadataKeyAuthority) xmlObj);
-            if (authoritySet != null) {
-                pkixInfoSet.add(authoritySet);
-            }            
-        }
-        cacheExtensionsInfo(extensions, pkixInfoSet);
-        return pkixInfoSet;
-    }
-
-    /**
-     * Retrieves validation information from the Shibboleth KeyAuthority metadata extension element.
-     * 
-     * @param keyAuthority the Shibboleth KeyAuthority element from which to resolve information
-     * @return an instance of resolved validation information
-     * @throws SecurityException thrown if the key, certificate, or CRL information is represented in an unsupported
-     *             format
-     */
-    protected PKIXValidationInformation resolvePKIXInfo(ShibbolethMetadataKeyAuthority keyAuthority)
-            throws SecurityException {
-
-        List<X509Certificate> certs = new ArrayList<X509Certificate>();
-        List<X509CRL> crls = new ArrayList<X509CRL>();
-        Integer depth = keyAuthority.getVerifyDepth();
-        if (depth == null) {
-            depth = KEY_AUTHORITY_VERIFY_DEPTH_DEFAULT;
-        }
-        
-        List<KeyInfo> keyInfos = keyAuthority.getKeyInfos();
-        if (keyInfos == null || keyInfos.isEmpty()) {
-            return null;
-        }
-        
-        for (KeyInfo keyInfo : keyInfos) {
-            certs.addAll(getX509Certificates(keyInfo));
-            crls.addAll(getX509CRLs(keyInfo));
-        }
-        
-        // Unlikely, but go ahead and check.
-        if (certs.isEmpty() && crls.isEmpty()) {
-            return null;
-        }
-
-        return new BasicPKIXValidationInformation(certs, crls, depth);
-    }
-
-    /**
-     * Extract certificates from a KeyInfo element.
-     * 
-     * @param keyInfo the KeyInfo instance from which to extract certificates
-     * @return a collection of X509 certificates, possibly empty
-     * @throws SecurityException thrown if the certificate information is represented in an unsupported format
-     */
-    protected List<X509Certificate> getX509Certificates(KeyInfo keyInfo) throws SecurityException {
-        try {
-            return KeyInfoHelper.getCertificates(keyInfo);
-        } catch (CertificateException e) {
-            throw new SecurityException("Error extracting certificates from KeyAuthority KeyInfo", e);
-        }
-
-    }
-
-    /**
-     * Extract CRL's from a KeyInfo element.
-     * 
-     * @param keyInfo the KeyInfo instance from which to extract CRL's
-     * @return a collection of X509 CRL's, possibly empty
-     * @throws SecurityException thrown if the CRL information is represented in an unsupported format
-     */
-    protected List<X509CRL> getX509CRLs(KeyInfo keyInfo) throws SecurityException {
-        try {
-            return KeyInfoHelper.getCRLs(keyInfo);
-        } catch (CRLException e) {
-            throw new SecurityException("Error extracting CRL's from KeyAuthority KeyInfo", e);
-        }
-
-    }
-
-    /**
-     * Retrieves trusted name information from the provided metadata.
-     * 
-     * @param entityID entity ID for which to resolve trusted names
-     * @param role role in which the entity is operating
-     * @param protocol protocol over which the entity is operating (may be null)
-     * @param usage usage specifier for role descriptor key descriptors to evaluate
-     * 
-     * @return collection of resolved trusted name information, possibly empty
-     * 
-     * @throws SecurityException thrown if there is an error extracting trusted name information
-     */
-    protected Set<String> retrieveTrustedNamesFromMetadata(String entityID, QName role, String protocol,
-            UsageType usage) throws SecurityException {
-
-        log.debug("Attempting to retrieve trusted names for PKIX validation from metadata for entity: {}", entityID);
-        Set<String> trustedNames = new LazySet<String>();
-        
-        List<RoleDescriptor> roleDescriptors = getRoleDescriptors(entityID, role, protocol);
-        if(roleDescriptors == null || roleDescriptors.isEmpty()){
-            return trustedNames;
-        }
-
-        for (RoleDescriptor roleDescriptor : roleDescriptors) {
-            List<KeyDescriptor> keyDescriptors = roleDescriptor.getKeyDescriptors();
-            if(keyDescriptors == null || keyDescriptors.isEmpty()){
-                return trustedNames;
-            }         
-            for (KeyDescriptor keyDescriptor : keyDescriptors) {
-                UsageType mdUsage = keyDescriptor.getUse();
-                if (mdUsage == null) {
-                    mdUsage = UsageType.UNSPECIFIED;
-                }
-                if (matchUsage(mdUsage, usage)) {
-                    if (keyDescriptor.getKeyInfo() != null) {
-                        trustedNames.addAll(getTrustedNames(keyDescriptor.getKeyInfo()));
-                    }
-                }
-            }
-
-        }
-
-        return trustedNames;
-    }
-
-    /**
-     * Extract trusted names from a KeyInfo element.
-     * 
-     * @param keyInfo the KeyInfo instance from which to extract trusted names
-     * @return set of trusted names, possibly empty
-     */
-    protected Set<String> getTrustedNames(KeyInfo keyInfo) {
-        // TODO return anything if there are things other than names in the KeyInfo ?
-        Set<String> names = new LazySet<String>();
-        names.addAll(KeyInfoHelper.getKeyNames(keyInfo));
-        return names;
-    }
-
-    /**
-     * Match usage enum type values from metadata KeyDescriptor and from specified resolution criteria.
-     * 
-     * @param metadataUsage the value from the 'use' attribute of a metadata KeyDescriptor element
-     * @param criteriaUsage the value from specified criteria
-     * @return true if the two usage specifiers match for purposes of resolving validation information, false otherwise
-     */
-    protected boolean matchUsage(UsageType metadataUsage, UsageType criteriaUsage) {
-        if (metadataUsage == UsageType.UNSPECIFIED || criteriaUsage == UsageType.UNSPECIFIED) {
-            return true;
-        }
-        return metadataUsage == criteriaUsage;
-    }
-
-    /**
-     * Get the list of metadata role descriptors which match the given entityID, role and protocol.
-     * 
-     * @param entityID entity ID of the metadata entity descriptor to resolve
-     * @param role role in which the entity is operating
-     * @param protocol protocol over which the entity is operating (may be null)
-     * @return a list of role descriptors matching the given parameters, or null
-     * @throws SecurityException thrown if there is an error retrieving role descriptors from the metadata provider
-     */
-    protected List<RoleDescriptor> getRoleDescriptors(String entityID, QName role, String protocol)
-            throws SecurityException {
-        try {
-            if (DatatypeHelper.isEmpty(protocol)) {
-                return metadata.getRole(entityID, role);
-            } else {
-                RoleDescriptor roleDescriptor = metadata.getRole(entityID, role, protocol);
-                if (roleDescriptor == null) {
-                    return null;
-                }
-                List<RoleDescriptor> roles = new ArrayList<RoleDescriptor>();
-                roles.add(roleDescriptor);
-                return roles;
-            }
-        } catch (MetadataProviderException e) {
-            log.error("Unable to read metadata from provider", e);
-            throw new SecurityException("Unable to read metadata provider", e);
-        }
-    }
-
-    /**
-     * Retrieves pre-resolved PKIX validation information from the cache.
-     * 
-     * @param cacheKey the key to the metadata cache
-     * @return the collection of cached info or null
-     */
-    protected List<PKIXValidationInformation> retrievePKIXInfoFromCache(MetadataCacheKey cacheKey) {
-        log.debug("Attempting to retrieve PKIX validation info from cache using index: {}", cacheKey);
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        log.debug("Read lock over cache acquired");
-        try {
-            if (entityPKIXCache.containsKey(cacheKey)) {
-                SoftReference<List<PKIXValidationInformation>> reference = entityPKIXCache.get(cacheKey);
-                if (reference.get() != null) {
-                    log.debug("Retrieved PKIX validation info from cache using index: {}", cacheKey);
-                    return reference.get();
-                }
-            }
-        } finally {
-            readLock.unlock();
-            log.debug("Read lock over cache released");
-        }
-
-        log.debug("Unable to retrieve PKIX validation info from cache using index: {}", cacheKey);
-        return null;
-    }
-
-    /**
-     * Retrieves pre-resolved PKIX validation information from the cache.
-     * 
-     * @param extensions the key to the metadata cache
-     * @return the collection of cached info or null
-     */
-    protected List<PKIXValidationInformation> retrieveExtensionsInfoFromCache(Extensions extensions) {
-        if (log.isDebugEnabled()) {
-            String parentName = getExtensionsParentName(extensions);
-            if (parentName != null) {
-                if (extensions.getParent() instanceof EntityDescriptor) {
-                    log.debug("Attempting to retrieve PKIX validation info from cache for Extensions "
-                            + "with EntityDescriptor parent: {}", parentName);
-                } else  if (extensions.getParent() instanceof EntitiesDescriptor) {
-                    log.debug("Attempting to retrieve PKIX validation info from cache for Extensions " 
-                            + "with EntitiesDescriptor parent: {}", parentName);
-                }
-            } else {
-                log.debug("Attempting to retrieve PKIX validation info from cache for Extensions " 
-                        + "with unidentified parent");
-            }
-        }
-        
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        log.debug("Read lock over cache acquired");
-        try {
-            if (extensionsCache.containsKey(extensions)) {
-                SoftReference<List<PKIXValidationInformation>> reference = extensionsCache.get(extensions);
-                if (reference.get() != null) {
-                    log.debug("Retrieved PKIX validation info from cache using index: {}", extensions);
-                    return reference.get();
-                }
-            }
-        } finally {
-            readLock.unlock();
-            log.debug("Read lock over cache released");
-        }
-        log.debug("Unable to retrieve PKIX validation info from cache using index: {}", extensions);
-        return null;
-    }
-    
-    /**
-     * Retrieves pre-resolved trusted names from the cache.
-     * 
-     * @param cacheKey the key to the metadata cache
-     * @return the set of cached info or null
-     */
-    protected Set<String> retrieveTrustedNamesFromCache(MetadataCacheKey cacheKey) {
-        log.debug("Attempting to retrieve trusted names from cache using index: {}", cacheKey);
-        Lock readLock = getReadWriteLock().readLock();
-        readLock.lock();
-        log.debug("Read lock over cache acquired");
-        try {
-            if (entityNamesCache.containsKey(cacheKey)) {
-                SoftReference<Set<String>> reference = entityNamesCache.get(cacheKey);
-                if (reference.get() != null) {
-                    log.debug("Retrieved trusted names from cache using index: {}", cacheKey);
-                    return reference.get();
-                }
-            }
-        } finally {
-            readLock.unlock();
-            log.debug("Read lock over cache released");
-        }
-
-        log.debug("Unable to retrieve trusted names from cache using index: {}", cacheKey);
-        return null;
-    }
-
-    /**
-     * Adds resolved PKIX validation information to the cache.
-     * 
-     * @param cacheKey the key for caching the information
-     * @param pkixInfo collection of PKIX information to cache
-     */
-    protected void cachePKIXInfo(MetadataCacheKey cacheKey, List<PKIXValidationInformation> pkixInfo) {
-        Lock writeLock = getReadWriteLock().writeLock();
-        writeLock.lock();
-        log.debug("Write lock over cache acquired");
-        try {
-            entityPKIXCache.put(cacheKey, new SoftReference<List<PKIXValidationInformation>>(pkixInfo));
-            log.debug("Added new PKIX info to entity cache with key: {}", cacheKey);
-        } finally {
-            writeLock.unlock();
-            log.debug("Write lock over cache released"); 
-        }
-    }
-
-    /**
-     * Adds resolved PKIX validation information to the cache.
-     * 
-     * @param extensions the key for caching the information
-     * @param pkixInfo collection of PKIX information to cache
-     */
-    protected void cacheExtensionsInfo(Extensions extensions, List<PKIXValidationInformation> pkixInfo) {
-        Lock writeLock = getReadWriteLock().writeLock();
-        writeLock.lock();
-        log.debug("Write lock over cache acquired");
-        try {
-            extensionsCache.put(extensions, new SoftReference<List<PKIXValidationInformation>>(pkixInfo));
-            if (log.isDebugEnabled()) {
-                log.debug("Added new PKIX info to cache for Extensions with parent: {}",
-                        getExtensionsParentName(extensions));
-            }
-        } finally {
-            writeLock.unlock();
-            log.debug("Write lock over cache released"); 
-        }
-    }
-
-    /**
-     * Adds resolved trusted name information to the cache.
-     * 
-     * @param cacheKey the key for caching the information
-     * @param names collection of names to cache
-     */
-    protected void cacheTrustedNames(MetadataCacheKey cacheKey, Set<String> names) {
-        Lock writeLock = getReadWriteLock().writeLock();
-        writeLock.lock();
-        log.debug("Write lock over cache acquired");
-        try {
-            entityNamesCache.put(cacheKey, new SoftReference<Set<String>>(names));
-            log.debug("Added new PKIX info to entity cache with key: {}", cacheKey);
-        } finally {
-            writeLock.unlock();
-            log.debug("Write lock over cache released"); 
-        }
-    }
-
-    /**
-     * Get the name of the parent element of an {@link Extensions} element in metadata, mostly
-     * useful for logging purposes.
-     * 
-     * If the parent is an EntityDescriptor, return the entityID value.  If an EntitiesDescriptor,
-     * return the name value.
-     * 
-     * @param extensions the Extensions element
-     * @return the Extensions element's parent's name
-     */
-    protected String getExtensionsParentName(Extensions extensions) {
-        XMLObject parent = extensions.getParent();
-        if (parent == null) {
-            return null;
-        }
-        if (parent instanceof EntityDescriptor) {
-            return ((EntityDescriptor) parent).getEntityID();
-        } else  if (extensions.getParent() instanceof EntitiesDescriptor) {
-            return ((EntitiesDescriptor) parent).getName();
-        }
-        return null;
-    }
-
-    /**
-     * A class which serves as the key into the cache of information previously resolved.
-     */
-    protected class MetadataCacheKey {
-
-        /** Entity ID associated with resolved information. */
-        private String id;
-
-        /** Role in which the entity is operating. */
-        private QName role;
-
-        /** Protocol over which the entity is operating (may be null). */
-        private String protocol;
-
-        /** Intended usage specifier of the role descriptor's key descriptor. */
-        private UsageType usage;
-
-        /**
-         * Constructor.
-         * 
-         * @param entityID entity ID of the metadata entity descriptor to resolve
-         * @param entityRole role in which the entity is operating
-         * @param entityProtocol protocol over which the entity is operating (may be null)
-         * @param entityUsage usage specifier of the role descriptor's key descriptor
-         */
-        protected MetadataCacheKey(String entityID, QName entityRole, String entityProtocol, UsageType entityUsage) {
-            if (entityID == null) {
-                throw new IllegalArgumentException("Entity ID may not be null");
-            }
-            if (entityRole == null) {
-                throw new IllegalArgumentException("Entity role may not be null");
-            }
-            if (entityUsage == null) {
-                throw new IllegalArgumentException("Usage may not be null");
-            }
-            id = entityID;
-            role = entityRole;
-            protocol = entityProtocol;
-            usage = entityUsage;
-        }
-
-        /** {@inheritDoc} */
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            }
-            if (!(obj instanceof MetadataCacheKey)) {
-                return false;
-            }
-            MetadataCacheKey other = (MetadataCacheKey) obj;
-            if (!this.id.equals(other.id) || !this.role.equals(other.role) || this.usage != other.usage) {
-                return false;
-            }
-            if (this.protocol == null) {
-                if (other.protocol != null) {
-                    return false;
-                }
-            } else {
-                if (!this.protocol.equals(other.protocol)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /** {@inheritDoc} */
-        public int hashCode() {
-            int result = 17;
-            result = 37 * result + id.hashCode();
-            result = 37 * result + role.hashCode();
-            if (protocol != null) {
-                result = 37 * result + protocol.hashCode();
-            }
-            result = 37 * result + usage.hashCode();
-            return result;
-        }
-
-        /** {@inheritDoc} */
-        public String toString() {
-            return String.format("[%s,%s,%s,%s]", id, role, protocol, usage);
-        }
-
-    }
-
-    /**
-     * An observer that clears the credential cache if the underlying metadata changes.
-     */
-    protected class MetadataProviderObserver implements ObservableMetadataProvider.Observer {
-
-        /** {@inheritDoc} */
-        public void onEvent(MetadataProvider provider) {
-            Lock writeLock = getReadWriteLock().writeLock();
-            writeLock.lock();
-            log.debug("Write lock over cache acquired");
-            try {
-                entityPKIXCache.clear();
-                extensionsCache.clear();
-                entityNamesCache.clear();
-                log.info("PKIX validation info cache cleared");
-            } finally {
-                writeLock.unlock();
-                log.debug("Write lock over cache released"); 
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/ShibbolethSecurityPolicy.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/ShibbolethSecurityPolicy.java.svn-base
deleted file mode 100644
index d189119..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/ShibbolethSecurityPolicy.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.security;
-
-import org.opensaml.ws.security.provider.BasicSecurityPolicy;
-import org.opensaml.xml.util.DatatypeHelper;
-
-/**
- * Extension to a basic security policy that adds a unique ID to the policy.
- */
-public class ShibbolethSecurityPolicy extends BasicSecurityPolicy {
-
-    /** ID of the policy. */
-    private String policyId;
-
-    /**
-     * Constructor.
-     * 
-     * @param id ID of the policy
-     */
-    public ShibbolethSecurityPolicy(String id) {
-        super();
-        policyId = DatatypeHelper.safeTrimOrNullString(id);
-    }
-
-    /**
-     * Gets the ID of the policy.
-     * 
-     * @return ID of the policy
-     */
-    public String getPolicyId() {
-        return policyId;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/all-wcprops
deleted file mode 100644
index aa671e8..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/service
-END
-ReloadableService.java
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/service/ReloadableService.java
-END
-ServiceException.java
-K 25
-svn:wc:ra_dav:version-url
-V 132
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/service/ServiceException.java
-END
-Service.java
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/service/Service.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/entries
deleted file mode 100644
index a62c9d3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/entries
+++ /dev/null
@@ -1,130 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/service
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ServiceException.java
-file
-
-
-
-
-2014-02-19T17:27:41.058745Z
-21f0c8d365c450517f9ee56e72a18cad
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1929
-

-Service.java
-file
-
-
-
-
-2014-02-19T17:27:41.058745Z
-4eeec9d71c44455d800dbb97102449ac
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2163
-

-ReloadableService.java
-file
-
-
-
-
-2014-02-19T17:27:41.058745Z
-ff76f655d594b53153635ae0bb57552e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1320
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/ReloadableService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/ReloadableService.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/ReloadableService.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/Service.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/Service.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/Service.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/ServiceException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/ServiceException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/prop-base/ServiceException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/ReloadableService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/ReloadableService.java.svn-base
deleted file mode 100644
index 9fc892f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/ReloadableService.java.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.service;
-
-/**
- * A service that supports reloading its configuration.
- */
-public interface ReloadableService extends Service {
-
-    /**
-     * Reloads the configuration of the service. Whether internal state is maintained between reloads is implementation
-     * depedent.
-     * 
-     * @throws ServiceException thrown if there is a problem reloading the service
-     */
-    public void reload() throws ServiceException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/Service.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/Service.java.svn-base
deleted file mode 100644
index b93d63b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/Service.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.service;
-
-/**
- * A simple interface that represents coarse grained services, or components, within the software.
- */
-public interface Service {
-
-    /**
-     * Gets the ID of this service.
-     * 
-     * @return ID of this service
-     */
-    public String getId();
-
-    /**
-     * Gets whether the service is initialized and ready for use.
-     * 
-     * @return true if the service is ready for use, false it not
-     */
-    public boolean isInitialized();
-
-    /**
-     * Initializes this service. Calling this on an initialized service should return immediately without affecting any
-     * service state.
-     * 
-     * @throws ServiceException thrown if there is a problem initializing the service
-     */
-    public void initialize() throws ServiceException;
-
-    /**
-     * Gets whether the service has been destroyed.
-     * 
-     * @return true if the service has been destroyed
-     */
-    public boolean isDestroyed();
-
-    /**
-     * Destroys a service, freeing any resources it may currently be using. Whether a service can be re-initialized
-     * after being destroyed is implementation dependent.
-     * 
-     * @throws ServiceException thrown if there is a problem destroying the service
-     */
-    public void destroy() throws ServiceException;
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/ServiceException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/ServiceException.java.svn-base
deleted file mode 100644
index 7253b4e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/service/.svn/text-base/ServiceException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.service;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethException;
-
-/** Base exception for Service related errors. */
-public class ServiceException extends ShibbolethException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 5230215114011879667L;
-
-    /**
-     * Constructor.
-     */
-    public ServiceException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public ServiceException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public ServiceException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public ServiceException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/all-wcprops
deleted file mode 100644
index 0ba5459..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 111
-/java-shib-common/!svn/ver/1041/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session
-END
-Session.java
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session/Session.java
-END
-LoginEvent.java
-K 25
-svn:wc:ra_dav:version-url
-V 126
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session/LoginEvent.java
-END
-LogoutEvent.java
-K 25
-svn:wc:ra_dav:version-url
-V 127
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session/LogoutEvent.java
-END
-SessionManager.java
-K 25
-svn:wc:ra_dav:version-url
-V 131
-/java-shib-common/!svn/ver/1041/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session/SessionManager.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/entries
deleted file mode 100644
index a0e5116..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/entries
+++ /dev/null
@@ -1,167 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-14T16:55:11.687677Z
-1041
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SessionManager.java
-file
-
-
-
-
-2014-02-19T17:27:42.578774Z
-8a395022db57264f69f84fa5e13ee105
-2012-11-14T16:55:11.687677Z
-1041
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3070
-

-impl
-dir
-

-Session.java
-file
-
-
-
-
-2014-02-19T17:27:42.578774Z
-0910454dff1d83ba38518d1579e9b462
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2450
-

-LoginEvent.java
-file
-
-
-
-
-2014-02-19T17:27:42.578774Z
-4075b35ab7496a17b7794f97ff43e76e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1608
-

-LogoutEvent.java
-file
-
-
-
-
-2014-02-19T17:27:42.578774Z
-c5a1f269d3797bbf2532e8fb253c9cbd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1666
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/LoginEvent.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/LoginEvent.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/LoginEvent.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/LogoutEvent.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/LogoutEvent.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/LogoutEvent.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/Session.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/Session.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/Session.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/SessionManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/SessionManager.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/prop-base/SessionManager.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/LoginEvent.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/LoginEvent.java.svn-base
deleted file mode 100644
index 42fef47..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/LoginEvent.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.session;
-
-import org.springframework.context.ApplicationEvent;
-
-/** An event representing the creation of a Shibboleth session that occurred because a user logged into the system. */
-public class LoginEvent extends ApplicationEvent {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = -898463237588351558L;
-
-    /**
-     * Constructor.
-     * 
-     * @param session session for the user logging in
-     */
-    public LoginEvent(Session session) {
-        super(session);
-    }
-
-    /**
-     * Gets the session for the user logging in.
-     * 
-     * @return session for the user logging in
-     */
-    public Session getUserSession() {
-        return (Session) getSource();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/LogoutEvent.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/LogoutEvent.java.svn-base
deleted file mode 100644
index a8aa901..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/LogoutEvent.java.svn-base
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.session;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * An event representing the destruction of a Shibboleth session that occured because a user logged out of the system or
- * because the application timed out.
- */
-public class LogoutEvent extends ApplicationEvent {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = -1234450648177702760L;
-
-    /**
-     * Constructor.
-     * 
-     * @param session session of the user being logged out
-     */
-    public LogoutEvent(Session session) {
-        super(session);
-    }
-
-    /**
-     * Gets the session for the user logging out.
-     * 
-     * @return session for the user logging out
-     */
-    public Session getUserSession() {
-        return (Session) getSource();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/Session.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/Session.java.svn-base
deleted file mode 100644
index 9221af5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/Session.java.svn-base
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.session;
-
-import java.io.Serializable;
-
-import javax.security.auth.Subject;
-
-import org.joda.time.DateTime;
-
-/** Session information for user currently logged in. */
-public interface Session extends Serializable {
-
-    /**
-     * Gets the unique identifier of the session.
-     * 
-     * @return unique identifier of the session
-     */
-    public String getSessionID();
-
-    /**
-     * Gets the subject with which this session is associated.
-     * 
-     * @return subject with which this session is associated
-     */
-    public Subject getSubject();
-    
-    /**
-     * Sets the subject with which this session is associated.
-     * 
-     * @param newSubject the subject with which this session is associated
-     */
-    public void setSubject(Subject newSubject);
-
-    /**
-     * A convenience method that gets the first principal retrieved from the {@link Subject}.
-     * 
-     * @return principal ID of the user, or null
-     */
-    public String getPrincipalName();
-
-    /**
-     * Gets the session inactivity timeout in milliseconds.
-     * 
-     * @return session inactivity timeout in milliseconds
-     */
-    public long getInactivityTimeout();
-
-    /**
-     * Gets the time of the last activity from the user.
-     * 
-     * @return time of the last activity from the user
-     */
-    public DateTime getLastActivityInstant();
-
-    /**
-     * Sets the time of the last activity from the user.
-     * 
-     * @param lastActivity time of the last activity from the user
-     */
-    public void setLastActivityInstant(DateTime lastActivity);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/SessionManager.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/SessionManager.java.svn-base
deleted file mode 100644
index 9029665..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/.svn/text-base/SessionManager.java.svn-base
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.session;
-
-/**
- * Session managers are responsible for creating, managing, and destroying Shibboleth sessions.
- * 
- * Session managers produce a {@link LoginEvent} during session creation and a {@link LogoutEvent} during session
- * destruction. These events are published in the root application context, that is the highest ancestor, of the
- * application context presented to a session manager.
- * 
- * @param <SessionType> type of session object managed
- */
-public interface SessionManager<SessionType extends Session> {
-
-    /**
-     * Creates an empty Shibboleth session. The created session only contains an session ID. No other properties are
-     * populated.
-     * 
-     * @return a Shibboleth session
-     * 
-     * @since 1.1
-     */
-    public SessionType createSession();
-
-    /**
-     * Creates a Shibboleth session.
-     * 
-     * @param principal the principal name of the user
-     * 
-     * @return a Shibboleth session
-     * 
-     * @deprecated use {@link #createSession()}
-     */
-    public SessionType createSession(String principal);
-
-    /**
-     * Destroys the session.
-     * 
-     * @param index the index of the session.
-     */
-    public void destroySession(String index);
-
-    /**
-     * Gets the user's session based on a session index.
-     * 
-     * @param index the index of the session
-     * 
-     * @return the session
-     */
-    public SessionType getSession(String index);
-
-    /**
-     * Indexes a session by the given string. This index is in addition to the session's ID.
-     * 
-     * @param session session to index
-     * @param index additional index
-     * 
-     * @return true if the given session is assigned the given index, false if not. This operation may fail if the given
-     *         index is already assigned to another session or if the given session is not managed by this session
-     *         manager.
-     * 
-     * @since 1.1
-     */
-    public boolean indexSession(SessionType session, String index);
-
-    /**
-     * Removes the given index from its associated session.
-     * 
-     * @param index index to be removed.
-     * 
-     * @since 1.1
-     */
-    public void removeSessionIndex(String index);
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/all-wcprops
deleted file mode 100644
index 631d73b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 115
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl
-END
-AbstractSession.java
-K 25
-svn:wc:ra_dav:version-url
-V 136
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/AbstractSession.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/entries
deleted file mode 100644
index 53307a5..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AbstractSession.java
-file
-
-
-
-
-2014-02-19T17:27:42.534774Z
-c7aa3b96f34bd3ebddf8f36ee272e7d4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3183
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/prop-base/AbstractSession.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/prop-base/AbstractSession.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/prop-base/AbstractSession.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/text-base/AbstractSession.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/text-base/AbstractSession.java.svn-base
deleted file mode 100644
index a4337c4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/session/impl/.svn/text-base/AbstractSession.java.svn-base
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.session.impl;
-
-import java.security.Principal;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-
-import org.joda.time.DateTime;
-import org.joda.time.chrono.ISOChronology;
-
-import edu.internet2.middleware.shibboleth.common.session.Session;
-
-/** Base class for Shibboleth sessions. */
-public abstract class AbstractSession implements Session {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 4726780089406295821L;
-
-    /** The session ID. */
-    private final String sessionId;
-
-    /** Subject of this session. */
-    private Subject subject;
-
-    /** Session inactivity timeout in milliseconds. */
-    private long inactivityTimeout;
-
-    /** The last activity time of the user. */
-    private long lastActivity;
-
-    /**
-     * Constructor.
-     * 
-     * @param id ID of the session
-     * @param timeout inactivity timeout for the session in milliseconds
-     */
-    public AbstractSession(String id, long timeout) {
-        sessionId = id;
-        subject = new Subject();
-        inactivityTimeout = timeout;
-        lastActivity = new DateTime().toDateTime(ISOChronology.getInstanceUTC()).getMillis();
-    }
-
-    /** {@inheritDoc} */
-    public synchronized String getSessionID() {
-        return sessionId;
-    }
-
-    /** {@inheritDoc} */
-    public synchronized Subject getSubject() {
-        return subject;
-    }
-
-    /** {@inheritDoc} */
-    public synchronized void setSubject(Subject newSubject) {
-        subject = newSubject;
-    }
-
-    /** {@inheritDoc} */
-    public synchronized String getPrincipalName() {
-        Set<Principal> principals = subject.getPrincipals();
-        if (principals != null && !principals.isEmpty()) {
-            return principals.iterator().next().getName();
-        } else {
-            return null;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public synchronized long getInactivityTimeout() {
-        return inactivityTimeout;
-    }
-
-    /** {@inheritDoc} */
-    public synchronized DateTime getLastActivityInstant() {
-        return new DateTime(lastActivity, ISOChronology.getInstanceUTC());
-    }
-
-    /** {@inheritDoc} */
-    public synchronized void setLastActivityInstant(DateTime activity) {
-        lastActivity = activity.toDateTime(ISOChronology.getInstanceUTC()).getMillis();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/all-wcprops
deleted file mode 100644
index bcfb95e..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/all-wcprops
+++ /dev/null
@@ -1,59 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 108
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util
-END
-Base32.java
-K 25
-svn:wc:ra_dav:version-url
-V 119
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/Base32.java
-END
-HttpHelper.java
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/HttpHelper.java
-END
-EventingMapBasedStorageService.java
-K 25
-svn:wc:ra_dav:version-url
-V 144
-/java-shib-common/!svn/ver/1086/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/EventingMapBasedStorageService.java
-END
-DataSealerException.java
-K 25
-svn:wc:ra_dav:version-url
-V 132
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/DataSealerException.java
-END
-DataSealer.java
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/DataSealer.java
-END
-StringResourceLoader.java
-K 25
-svn:wc:ra_dav:version-url
-V 134
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/StringResourceLoader.java
-END
-VelocityStringResourceRepositoryAdaptor.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/VelocityStringResourceRepositoryAdaptor.java
-END
-DataExpiredException.java
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/DataExpiredException.java
-END
-Slf4JLogChute.java
-K 25
-svn:wc:ra_dav:version-url
-V 127
-/java-shib-common/!svn/ver/1068/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util/Slf4JLogChute.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/entries
deleted file mode 100644
index a7e8886..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/entries
+++ /dev/null
@@ -1,334 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/util
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-Slf4JLogChute.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-1d6ef50b5cafbe396207c3103381484e
-2013-03-25T22:00:41.297573Z
-1068
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4151
-

-Base32.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-afa6bb5af7cbc90c5628b3b2f4a71a50
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10376
-

-HttpHelper.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-73aca6978155b5cfb69408403c69afd2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1669
-

-EventingMapBasedStorageService.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-2486cb8cb564f34e75f3b794bdf33f9c
-2013-08-16T02:07:15.172662Z
-1086
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11229
-

-DataSealerException.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-aae1109c405152856b7d6e3426b6abcb
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1948
-

-DataSealer.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-34ed2a9d342927cd86e685102486660b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-18551
-

-StringResourceLoader.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-e1c9eee407970e23edbbceb9ca79c03f
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14427
-

-VelocityStringResourceRepositoryAdaptor.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-f0cac00160765c3f6c1f61a38bab56ed
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3706
-

-DataExpiredException.java
-file
-
-
-
-
-2014-02-19T17:27:45.870839Z
-ec2670bcc1958a59bb15e286f10fbf88
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1853
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/Base32.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/Base32.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/Base32.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataExpiredException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataExpiredException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataExpiredException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataSealer.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataSealer.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataSealer.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataSealerException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataSealerException.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/DataSealerException.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/EventingMapBasedStorageService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/EventingMapBasedStorageService.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/EventingMapBasedStorageService.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/HttpHelper.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/HttpHelper.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/HttpHelper.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/Slf4JLogChute.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/Slf4JLogChute.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/Slf4JLogChute.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/StringResourceLoader.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/StringResourceLoader.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/StringResourceLoader.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/VelocityStringResourceRepositoryAdaptor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/VelocityStringResourceRepositoryAdaptor.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/VelocityStringResourceRepositoryAdaptor.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/Base32.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/Base32.java.svn-base
deleted file mode 100644
index 6fcaa6f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/Base32.java.svn-base
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-/**
- * Base32 - encodes and decodes 'Canonical' Base32
- *
- * @author  Robert Kaye & Gordon Mohr
- */
-public class Base32 {
-
-	/* lookup table used to encode() groups of 5 bits of data */
-	private static final String base32Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-
-	/* lookup table used to decode() characters in Base32 strings */
-	private static final byte[] base32Lookup =
-		{ 26,27,28,29,30,31,-1,-1,-1,-1,-1,-1,-1,-1,       //   23456789:;<=>?
-		  -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, // @ABCDEFGHIJKLMNO
-	 	  15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, // PQRSTUVWXYZ[\]^_
-		  -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, // `abcdefghijklmno
-		  15,16,17,18,19,20,21,22,23,24,25                 // pqrstuvwxyz
-    		};
-
-	/* Messsages for Illegal Parameter Exceptions in decode() */
-	private static final String errorCanonicalLength = "non canonical Base32 string length";
-	private static final String errorCanonicalEnd    = "non canonical bits at end of Base32 string";
-	private static final String errorInvalidChar     = "invalid character in Base32 string";
-
-	/**
-	 * Encode an array of binary bytes into a Base32 string.
-	 * Should not fail (the only possible exception is that the
-	 * returned string cannot be allocated in memory)
-	 */    
-	static public String encode(final byte[] bytes) {
-    
-		StringBuffer base32 = new StringBuffer((bytes.length * 8 + 4) / 5);
-		int currByte, digit, i = 0;
-
-		while (i < bytes.length) {
-		
-			// INVARIANTS FOR EACH STEP n in [0..5[; digit in [0..31[; 
-			// The remaining n bits are already aligned on top positions
-			// of the 5 least bits of digit, the other bits are 0.
-			
-			// STEP n = 0; insert new 5 bits, leave 3 bits
-			currByte = bytes[i++] & 255;
-			base32.append(base32Chars.charAt(currByte >> 3));
-			digit = (currByte & 7) << 2;
-			if (i >= bytes.length) { // put the last 3 bits
-				base32.append(base32Chars.charAt(digit));
-				break;
-			}
-            
-
-			// STEP n = 3: insert 2 new bits, then 5 bits, leave 1 bit
-			currByte = bytes[i++] & 255;
-			base32.append(base32Chars.charAt(digit | (currByte >> 6)));
-			base32.append(base32Chars.charAt((currByte >> 1) & 31));
-			digit = (currByte & 1) << 4;
-			if (i >= bytes.length) { // put the last 1 bit
-				base32.append(base32Chars.charAt(digit));
-				break;
-			}
-
-			// STEP n = 1: insert 4 new bits, leave 4 bit
-			currByte = bytes[i++] & 255;
-			base32.append(base32Chars.charAt(digit | (currByte >> 4)));
-			digit = (currByte & 15) << 1;
-			if (i >= bytes.length) { // put the last 4 bits
-				base32.append(base32Chars.charAt(digit));
-				break;
-			}
-
-			// STEP n = 4: insert 1 new bit, then 5 bits, leave 2 bits
-			currByte = bytes[i++] & 255;
-			base32.append(base32Chars.charAt(digit | (currByte >> 7)));
-			base32.append(base32Chars.charAt((currByte >> 2) & 31));
-			digit = (currByte & 3) << 3;
-			if (i >= bytes.length) { // put the last 2 bits
-				base32.append(base32Chars.charAt(digit));
-				break;
-			}
-
-			// STEP n = 2: insert 3 new bits, then 5 bits, leave 0 bit
-			currByte = bytes[i++] & 255;
-			base32.append(base32Chars.charAt(digit | (currByte >> 5)));
-			base32.append(base32Chars.charAt(currByte & 31));
-			//// This point is reached for bytes.length multiple of 5
-		}
-	
-		return base32.toString();
-	}
-
-   
-	/**
-	 * Decode a Base32 string into an array of binary bytes.
-	 * May fail if the parameter is a non canonical Base32 string	
-	 * (the only other possible exception is that the
-	 * returned array cannot be allocated in memory)
-	 */    
-	static public byte[] decode(final String base32) throws IllegalArgumentException {
-
-	// Note that the code below detects could detect non canonical
-	// Base32 length within the loop. However canonical Base32 length
-	// can be tested before entering the loop.
-	// A canonical Base32 length modulo 8 cannot be:
-	// 1 (aborts discarding 5 bits at STEP n=0 which produces no byte),
-	// 3 (aborts discarding 7 bits at STEP n=2 which produces no byte),
-	// 6 (aborts discarding 6 bits at STEP n=1 which produces no byte)
-	// So these tests could be avoided within the loop.
-	switch (base32.length() % 8) { // test the length of last subblock
-
-		case 1: //  5 bits in subblock:  0 useful bits but 5 discarded
-		case 3: // 15 bits in subblock:  8 useful bits but 7 discarded
-		case 6: // 30 bits in subblock: 24 useful bits but 6 discarded
-          
-		throw new IllegalArgumentException(errorCanonicalLength);
-	}
-
-	byte[] bytes = new byte[base32.length() * 5 / 8];
-	int offset = 0, i = 0, lookup;
-	byte nextByte, digit;
-
-	// Also the code below does test that other discarded bits
-	// (1 to 4 bits at end) are effectively 0.
-	while (i < base32.length()) {
-		// Read the 1st char in a 8-chars subblock
-		// check that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 0: leave 5 bits
-		nextByte = (byte)(digit << 3);
-		// Assert(i < base32.length) // tested before loop
-		// Read the 2nd char in a 8-chars subblock
-		// Check that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 5: insert 3 bits, leave 2 bits
-		bytes[offset++] = (byte)(nextByte | (digit >> 2));
-		nextByte = (byte)((digit & 3) << 6);
-		if (i >= base32.length()) {
-			if (nextByte != (byte)0) {
-				throw new IllegalArgumentException(errorCanonicalEnd);
-			}
-			break; // discard the remaining 2 bits
-		}
-
-		// Read the 3rd char in a 8-chars subblock
-		// Check that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 2: leave 7 bits
-		nextByte |= (byte)(digit << 1);
-		// Assert(i < base32.length) // tested before loop
- 		// Read the 4th char in a 8-chars subblock
-		// Check that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 7: insert 1 bit, leave 4 bits
-		bytes[offset++] = (byte)(nextByte | (digit >> 4));
-		nextByte = (byte)((digit & 15) << 4);
-		if (i >= base32.length()) {
-			if (nextByte != (byte)0) {
-				throw new IllegalArgumentException(errorCanonicalEnd);
-			}
-			break; // discard the remaining 4 bits
-		}
-
-		// Read the 5th char in a 8-chars subblock
-		// Assert that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 4: insert 4 bits, leave 1 bit
-		bytes[offset++] = (byte)(nextByte | (digit >> 1));
-		nextByte = (byte)((digit & 1) << 7);
-		if (i >= base32.length()) {
-			if (nextByte != (byte)0) {
-				throw new IllegalArgumentException(errorCanonicalEnd);
-			}
-			break; // discard the remaining 1 bit
-		}
-
-		// Read the 6th char in a 8-chars subblock
-		// Check that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 1: leave 6 bits
-		nextByte |= (byte)(digit << 2);
-		// Assert(i < base32.length) // tested before loop
-		// Read the 7th char in a 8-chars subblock
-		// Check that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 6: insert 2 bits, leave 3 bits
-		bytes[offset++] = (byte)(nextByte | (digit >> 3));
-		nextByte = (byte)((digit & 7) << 5);
-		if (i >= base32.length()) {
-			if (nextByte != (byte)0) {
-				throw new IllegalArgumentException(errorCanonicalEnd);
-			}
-			break; // discard the remaining 3 bits
-		}
-        
-		// Read the 8th char in a 8-chars subblock
-		// Check that chars are not outside the lookup table and valid
-		lookup = base32.charAt(i++) - '2';
-		if (lookup < 0 || lookup >= base32Lookup.length) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-		digit = base32Lookup[lookup];
-		if (digit == -1) {
-			throw new IllegalArgumentException(errorInvalidChar);
-		}
-
-		// STEP n = 3: insert 5 bits, leave 0 bit
-		bytes[offset++] = (byte)(nextByte | digit);
-		// possible end of string here with no trailing bits
-	}
-
-		// On loop exit, discard trialing n bits.
-		return bytes;
-	}
-}
-
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataExpiredException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataExpiredException.java.svn-base
deleted file mode 100644
index eb4d01f..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataExpiredException.java.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-/** Indicates the sealed data has expired. */
-public class DataExpiredException extends DataSealerException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 4889277008558784084L;
-
-    /**
-     * Constructor.
-     */
-    public DataExpiredException() {
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public DataExpiredException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public DataExpiredException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public DataExpiredException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataSealer.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataSealer.java.svn-base
deleted file mode 100644
index b38da5c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataSealer.java.svn-base
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.KeyException;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import javax.crypto.Cipher;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Applies a MAC to time-limited information and encrypts with a symmetric key.
- * 
- * @author Scott Cantor
- * @author Walter Hoehn
- * @author Derek Morr
- */
-public class DataSealer {
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(DataSealer.class.getName());
-
-    /** Key used for encryption. */
-    private SecretKey cipherKey;
-
-    /** Key used for MAC. */
-    private SecretKey macKey;
-
-    /** Source of secure random data. */
-    private SecureRandom random;
-
-    /** Tye of keystore to use for access to keys. */
-    private String keystoreType = "JCEKS";
-
-    /** Path to keystore. */
-    private String keystorePath;
-
-    /** Password for keystore. */
-    private String keystorePassword;
-
-    /** Keystore alias for the encryption key. */
-    private String cipherKeyAlias;
-
-    /** Password for encryption key. */
-    private String cipherKeyPassword;
-
-    /** Encryption algorithm to use. */
-    private String cipherAlgorithm = "AES/CBC/PKCS5Padding";
-
-    /** Keystore alias for the MAC key. */
-    private String macKeyAlias;
-
-    /** Password for MAC key. */
-    private String macKeyPassword;
-
-    /** MAC algorithm to use. */
-    private String macAlgorithm = "HmacSHA256";
-
-    /**
-     * Initialization method used after setting all relevant bean properties.
-     * @throws DataSealerException if initialization fails
-     */
-    public void init() throws DataSealerException {
-        try {
-            if (cipherKey == null) {
-                if (keystoreType == null || keystorePath == null || keystorePassword == null || cipherKeyAlias == null
-                        || cipherKeyPassword == null) {
-                    throw new IllegalArgumentException("Missing a required configuration property.");
-                }
-            }
-
-            if (random == null) {
-                random = new SecureRandom();
-            }
-
-            loadKeys();
-
-            // Before we finish initialization, make sure that things are working.
-            testEncryption();
-
-        } catch (GeneralSecurityException e) {
-            log.error(e.getMessage());
-            throw new DataSealerException("Caught NoSuchAlgorithmException loading the java keystore.", e);
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw new DataSealerException("Caught IOException loading the java keystore.", e);
-        }
-    }
-
-    /**
-     * Returns the encryption key.
-     * @return the encryption key
-     */
-    public SecretKey getCipherKey() {
-        return cipherKey;
-    }
-
-    /**
-     * Returns the MAC key, if different from the encryption key.
-     * @return the MAC key
-     */
-    public SecretKey getMacKey() {
-        return macKey;
-    }
-
-    /**
-     * Returns the pseudorandom generator.
-     * @return the pseudorandom generator
-     */
-    public SecureRandom getRandom() {
-        return random;
-    }
-
-    /**
-     * Returns the keystore type.
-     * @return the keystore type.
-     */
-    public String getKeystoreType() {
-        return keystoreType;
-    }
-
-    /**
-     * Returns the keystore path.
-     * @return the keystore path
-     */
-    public String getKeystorePath() {
-        return keystorePath;
-    }
-
-    /**
-     * Returns the keystore password.
-     * @return the keystore password
-     */
-    public String getKeystorePassword() {
-        return keystorePassword;
-    }
-
-    /**
-     * Returns the encryption key alias.
-     * @return the encryption key alias
-     */
-    public String getCipherKeyAlias() {
-        return cipherKeyAlias;
-    }
-
-    /**
-     * Returns the encryption key password.
-     * @return the encryption key password
-     */
-    public String getCipherKeyPassword() {
-        return cipherKeyPassword;
-    }
-
-    /**
-     * Returns the encryption algorithm.
-     * @return the encryption algorithm
-     */
-    public String getCipherAlgorithm() {
-        return cipherAlgorithm;
-    }
-
-    /**
-     * Returns the MAC key alias.
-     * @return the MAC key alias
-     */
-    public String getMacKeyAlias() {
-        return macKeyAlias;
-    }
-
-    /**
-     * Returns the MAC key password.
-     * @return the MAC key password
-     */
-    public String getMacKeyPassword() {
-        return macKeyPassword;
-    }
-
-    /**
-     * Returns the MAC algorithm.
-     * @return the MAC algorithm
-     */
-    public String getMacAlgorithm() {
-        return macAlgorithm;
-    }
-
-    /**
-     * Sets the encryption key.
-     * @param key the encryption key to set
-     */
-    public void setCipherKey(SecretKey key) {
-        cipherKey = key;
-    }
-
-    /**
-     * Sets the MAC key.
-     * @param key the MAC key to set
-     */
-    public void setMacKey(SecretKey key) {
-        macKey = key;
-    }
-
-    /**
-     * Sets the pseudorandom generator.
-     * @param r the pseudorandom generator to set
-     */
-    public void setRandom(SecureRandom r) {
-        random = r;
-    }
-
-    /**
-     * Sets the keystore type.
-     * @param type the keystore type to set
-     */
-    public void setKeystoreType(String type) {
-        keystoreType = type;
-    }
-
-    /**
-     * Sets the keystore path.
-     * @param path the keystore path to set
-     */
-    public void setKeystorePath(String path) {
-        keystorePath = path;
-    }
-
-    /**
-     * Sets the keystore password.
-     * @param password the keystore password to set
-     */
-    public void setKeystorePassword(String password) {
-        keystorePassword = password;
-    }
-
-    /**
-     * Sets the encryption key alias.
-     * @param alias the encryption key alias to set
-     */
-    public void setCipherKeyAlias(String alias) {
-        cipherKeyAlias = alias;
-    }
-
-    /**
-     * Sets the encryption key password.
-     * @param password the encryption key password to set
-     */
-    public void setCipherKeyPassword(String password) {
-        cipherKeyPassword = password;
-    }
-
-    /**
-     * Sets the encryption algorithm.
-     * @param alg the encryption algorithm to set
-     */
-    public void setCipherAlgorithm(String alg) {
-        cipherAlgorithm = alg;
-    }
-
-    /**
-     * Sets the MAC key alias.
-     * @param alias the MAC key alias to set
-     */
-    public void setMacKeyAlias(String alias) {
-        macKeyAlias = alias;
-    }
-
-    /**
-     * Sets the MAC key password.
-     * @param password the the MAC key password to set
-     */
-    public void setMacKeyPassword(String password) {
-        macKeyPassword = password;
-    }
-
-    /**
-     * Sets the MAC key algorithm.
-     * @param alg the MAC algorithm to set
-     */
-    public void setMacAlgorithm(String alg) {
-        macAlgorithm = alg;
-    }
-
-    /**
-     * Decrypts and verifies an encrypted bundle of MAC'd data, and returns it.
-     * 
-     * @param wrapped the encoded blob
-     * @return the decrypted data, if it's unexpired
-     * @throws DataSealerException if the data cannot be unwrapped and verified
-     */
-    public String unwrap(String wrapped) throws DataSealerException {
-
-        try {
-            byte[] in = Base32.decode(wrapped);
-
-            Cipher cipher = Cipher.getInstance(cipherAlgorithm);
-            int ivSize = cipher.getBlockSize();
-            byte[] iv = new byte[ivSize];
-
-            Mac mac = Mac.getInstance(macAlgorithm);
-            mac.init(macKey);
-            int macSize = mac.getMacLength();
-
-            if (in.length < ivSize) {
-                log.error("Wrapped data is malformed (not enough bytes).");
-                throw new DataSealerException("Wrapped data is malformed (not enough bytes).");
-            }
-
-            // extract the IV, setup the cipher and extract the encrypted handle
-            System.arraycopy(in, 0, iv, 0, ivSize);
-            IvParameterSpec ivSpec = new IvParameterSpec(iv);
-            cipher.init(Cipher.DECRYPT_MODE, cipherKey, ivSpec);
-
-            byte[] encryptedHandle = new byte[in.length - iv.length];
-            System.arraycopy(in, ivSize, encryptedHandle, 0, in.length - iv.length);
-
-            // decrypt the rest of the data and setup the streams
-            byte[] decryptedBytes = cipher.doFinal(encryptedHandle);
-            ByteArrayInputStream byteStream = new ByteArrayInputStream(decryptedBytes);
-            GZIPInputStream compressedData = new GZIPInputStream(byteStream);
-            DataInputStream dataStream = new DataInputStream(compressedData);
-
-            // extract the components
-            byte[] decodedMac = new byte[macSize];
-            int bytesRead = dataStream.read(decodedMac);
-            if (bytesRead != macSize) {
-                log.error("Error parsing unwrapped data, unable to extract HMAC.");
-                throw new DataSealerException("Error parsing unwrapped data, unable to extract HMAC.");
-            }
-            long decodedExpirationTime = dataStream.readLong();
-            String decodedData = dataStream.readUTF();
-
-            if (System.currentTimeMillis() > decodedExpirationTime) {
-                log.info("Unwrapped data has expired.");
-                throw new DataExpiredException("Unwrapped data has expired.");
-            }
-
-            byte[] generatedMac = getMAC(mac, decodedData, decodedExpirationTime);
-
-            if (!Arrays.equals(decodedMac, generatedMac)) {
-                log.warn("Unwrapped data failed integrity check.");
-                throw new DataSealerException("Unwrapped data failed integrity check.");
-            }
-
-            log.debug("Unwrapped data verified.");
-            return decodedData;
-
-        } catch (GeneralSecurityException e) {
-            log.error(e.getMessage());
-            throw new DataSealerException("Caught GeneralSecurityException unwrapping data.", e);
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw new DataSealerException("Caught IOException unwrapping data.", e);
-        }
-    }
-
-    /**
-     * Encodes data into a cryptographic blob: [IV][HMAC][exp][data] where: [IV] = the Initialization Vector; byte-array
-     * [HMAC] = the HMAC; byte array [exp] = expiration time of the data; 8 bytes; Big-endian [data] = the principal; a
-     * UTF-8-encoded string The bytes are then GZIP'd. The IV is pre-pended to this byte stream, and the result is
-     * Base32-encoded. We don't need to encode the IV or MAC's lengths. They can be obtained from Cipher.getBlockSize()
-     * and Mac.getMacLength(), respectively.
-     * 
-     * @param data the data to wrap
-     * @param exp expiration time
-     * @return the encoded blob
-     * @throws DataSealerException if the wrapping operation fails
-     */
-    public String wrap(String data, long exp) throws DataSealerException {
-
-        if (data == null) {
-            throw new IllegalArgumentException("Data must be supplied for the wrapping operation.");
-        }
-
-        try {
-            Mac mac = Mac.getInstance(macAlgorithm);
-            mac.init(macKey);
-
-            Cipher cipher = Cipher.getInstance(cipherAlgorithm);
-            byte[] iv = new byte[cipher.getBlockSize()];
-            random.nextBytes(iv);
-            IvParameterSpec ivSpec = new IvParameterSpec(iv);
-            cipher.init(Cipher.ENCRYPT_MODE, cipherKey, ivSpec);
-
-            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-            GZIPOutputStream compressedStream = new GZIPOutputStream(byteStream);
-            DataOutputStream dataStream = new DataOutputStream(compressedStream);
-
-            dataStream.write(getMAC(mac, data, exp));
-            dataStream.writeLong(exp);
-            dataStream.writeUTF(data);
-
-            dataStream.flush();
-            compressedStream.flush();
-            compressedStream.finish();
-            byteStream.flush();
-
-            byte[] encryptedData = cipher.doFinal(byteStream.toByteArray());
-
-            byte[] handleBytes = new byte[iv.length + encryptedData.length];
-            System.arraycopy(iv, 0, handleBytes, 0, iv.length);
-            System.arraycopy(encryptedData, 0, handleBytes, iv.length, encryptedData.length);
-
-            return Base32.encode(handleBytes);
-
-        } catch (KeyException e) {
-            log.error(e.getMessage());
-            throw new DataSealerException("Caught KeyException wrapping data.", e);
-        } catch (GeneralSecurityException e) {
-            log.error(e.getMessage());
-            throw new DataSealerException("Caught GeneralSecurityException wrapping data.", e);
-        } catch (IOException e) {
-            log.error(e.getMessage());
-            throw new DataSealerException("Caught IOException wrapping data.", e);
-        }
-
-    }
-
-    /**
-     * Run a test over the configured bean properties.
-     * @throws DataSealerException if the test fails
-     */
-    private void testEncryption() throws DataSealerException {
-
-        String decrypted;
-        try {
-            Cipher cipher = Cipher.getInstance(cipherAlgorithm);
-            byte[] iv = new byte[cipher.getBlockSize()];
-            random.nextBytes(iv);
-            IvParameterSpec ivSpec = new IvParameterSpec(iv);
-            cipher.init(Cipher.ENCRYPT_MODE, cipherKey, ivSpec);
-            byte[] cipherText = cipher.doFinal("test".getBytes());
-            cipher = Cipher.getInstance(cipherAlgorithm);
-            cipher.init(Cipher.DECRYPT_MODE, cipherKey, ivSpec);
-            decrypted = new String(cipher.doFinal(cipherText));
-        } catch (GeneralSecurityException e) {
-            log.error("Round trip encryption/decryption test unsuccessful: " + e);
-            throw new DataSealerException("Round trip encryption/decryption test unsuccessful.", e);
-        }
-        
-        if (decrypted == null || !"test".equals(decrypted)) {
-            log.error("Round trip encryption/decryption test unsuccessful. Decrypted text did not match.");
-            throw new DataSealerException("Round trip encryption/decryption test unsuccessful.");
-        }
-
-        byte[] code;
-        try {
-            Mac mac = Mac.getInstance(macAlgorithm);
-            mac.init(macKey);
-            mac.update("foo".getBytes());
-            code = mac.doFinal();
-        } catch (GeneralSecurityException e) {
-            log.error("Message Authentication test unsuccessful: " + e);
-            throw new DataSealerException("Message Authentication test unsuccessful.", e);
-        }
-
-        if (code == null) {
-            log.error("Message Authentication test unsuccessful.");
-            throw new DataSealerException("Message Authentication test unsuccessful.");
-        }
-    }
-
-    /**
-     * Compute a MAC over a string, prefixed by an expiration time.
-     * @param mac   MAC object to use
-     * @param data  data to hash
-     * @param exp   timestamp to prefix the data with
-     * @return  the resulting MAC
-     */
-    private static byte[] getMAC(Mac mac, String data, long exp) {
-        mac.update(getLongBytes(exp));
-        mac.update(data.getBytes());
-        return mac.doFinal();
-    }
-
-    /**
-     * Convert a long value into a byte array.
-     * @param longValue value to convert
-     * @return  a byte array
-     */
-    private static byte[] getLongBytes(long longValue) {
-        try {
-            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-            DataOutputStream dataStream = new DataOutputStream(byteStream);
-
-            dataStream.writeLong(longValue);
-            dataStream.flush();
-            byteStream.flush();
-
-            return byteStream.toByteArray();
-        } catch (IOException ex) {
-            return null;
-        }
-    }
-
-    /**
-     * Load keys based on bean properties.
-     * @throws GeneralSecurityException if the keys fail due to a security-related issue
-     * @throws IOException if the load process fails
-     */
-    private void loadKeys() throws GeneralSecurityException, IOException {
-        if (cipherKey == null || macKey == null) {
-            KeyStore ks = KeyStore.getInstance(keystoreType);
-            FileInputStream fis = null;
-            try {
-                fis = new java.io.FileInputStream(keystorePath);
-                ks.load(fis, keystorePassword.toCharArray());
-            } finally {
-                if (fis != null) {
-                    fis.close();
-                }
-            }
-
-            Key loadedKey;
-            if (cipherKey == null) {
-                loadedKey = ks.getKey(cipherKeyAlias, cipherKeyPassword.toCharArray());
-                if (!(loadedKey instanceof SecretKey)) {
-                    log.error("Cipher key {} is not a symmetric key.", cipherKeyAlias);
-                }
-                cipherKey = (SecretKey) loadedKey;
-            }
-
-            if (macKey == null && macKeyAlias != null) {
-                loadedKey = ks.getKey(macKeyAlias, macKeyPassword.toCharArray());
-                if (!(loadedKey instanceof SecretKey)) {
-                    log.error("MAC key {} is not a symmetric key.", macKeyAlias);
-                }
-                macKey = (SecretKey) loadedKey;
-            } else if (macKey == null) {
-                macKey = cipherKey;
-            }
-        }
-    }
-    
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataSealerException.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataSealerException.java.svn-base
deleted file mode 100644
index d84639b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/DataSealerException.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethException;
-
-/** Exceptions during use of the {@link DataSealer}. */
-public class DataSealerException extends ShibbolethException {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = -2969018053022729611L;
-
-    /**
-     * Constructor.
-     */
-    public DataSealerException() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     */
-    public DataSealerException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public DataSealerException(Throwable wrappedException) {
-        super(wrappedException);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param message exception message
-     * @param wrappedException exception to be wrapped by this one
-     */
-    public DataSealerException(String message, Throwable wrappedException) {
-        super(message, wrappedException);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/EventingMapBasedStorageService.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/EventingMapBasedStorageService.java.svn-base
deleted file mode 100644
index 23aa45a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/EventingMapBasedStorageService.java.svn-base
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.opensaml.util.storage.StorageService;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationEvent;
-
-/**
- * A thread-safe implementation of {@link StorageService} that publishes event when items are added or removed from the
- * service.
- * 
- * An {@link AddEntryEvent} is published after an item has been added to the storage service. A {@link RemoveEntryEvent}
- * is published after an item has been removed from the storage service. These events are published in the root
- * application context, that is the highest ancestor, of the application context presented to this class.
- * 
- * @param <KeyType> object type of the keys
- * @param <ValueType> object type of the values
- */
-public class EventingMapBasedStorageService<KeyType, ValueType> implements StorageService<KeyType, ValueType>,
-        ApplicationContextAware {
-
-    /** Spring application context. */
-    private ApplicationContext appCtx;
-
-    /** Backing map. */
-    private Map<String, Map<KeyType, ValueType>> store;
-
-    /** Constructor. */
-    public EventingMapBasedStorageService() {
-        store = new ConcurrentHashMap<String, Map<KeyType, ValueType>>();
-    }
-
-    /** {@inheritDoc} */
-    public boolean contains(String partition, Object key) {
-        if (partition == null || key == null) {
-            return false;
-        }
-
-        if (store.containsKey(partition)) {
-            return store.get(partition).containsKey(key);
-        }
-
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    public ValueType get(String partition, Object key) {
-        if (partition == null || key == null) {
-            return null;
-        }
-
-        if (store.containsKey(partition)) {
-            return store.get(partition).get(key);
-        }
-
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public Iterator<KeyType> getKeys(String partition) {
-        if(partition == null){
-            return null;
-        }
-        
-        if(store.containsKey(partition)){
-            return new PartitionEntryIterator(partition);
-        }
-        
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public Iterator<String> getPartitions() {
-        return new PartitionIterator();
-    }
-
-    /** {@inheritDoc} */
-    public ValueType put(String partition, KeyType key, ValueType value) {
-        if (partition == null || key == null) {
-            return null;
-        }
-
-        Map<KeyType, ValueType> partitionMap;
-        synchronized (store) {
-            partitionMap = store.get(partition);
-            if (partitionMap == null) {
-                partitionMap = new ConcurrentHashMap<KeyType, ValueType>();
-                store.put(partition, partitionMap);
-            }
-        }
-
-        ValueType replacedEntry = partitionMap.put(key, value);
-        appCtx.publishEvent(new AddEntryEvent(this, partition, key, value));
-        return replacedEntry;
-    }
-
-    /** {@inheritDoc} */
-    public ValueType remove(String partition, KeyType key) {
-        if (partition == null || key == null) {
-            return null;
-        }
-
-        if (store.containsKey(partition)) {
-            ValueType removedEntry = store.get(partition).remove(key);
-            appCtx.publishEvent(new RemoveEntryEvent(this, partition, key, removedEntry));
-            return removedEntry;
-        }
-
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    public void setApplicationContext(ApplicationContext ctx) {
-        ApplicationContext rootContext = ctx;
-        while (rootContext.getParent() != null) {
-            rootContext = rootContext.getParent();
-        }
-        appCtx = rootContext;
-    }
-
-    /** An event indicating an item has been added to an storage service. */
-    public static class AddEntryEvent<KeyType, ValueType> extends ApplicationEvent {
-
-        /** Serial version UID. */
-        private static final long serialVersionUID = -1939512157260059492L;
-
-        /** Storage service to which the item was added. */
-        private StorageService<KeyType, ValueType> storageService;
-
-        /** Storage partition to which the item was added. */
-        private String partition;
-
-        /** Key to the added item. */
-        private KeyType key;
-
-        /** The added item. */
-        private ValueType value;
-
-        /**
-         * Constructor.
-         * 
-         * @param storageService storage service to which an item was added
-         * @param partition partition to which the entry was added
-         * @param key key of the added item
-         * @param value added item
-         */
-        public AddEntryEvent(StorageService<KeyType, ValueType> storageService, String partition, KeyType key,
-                ValueType value) {
-            super(storageService);
-            this.storageService = storageService;
-            this.partition = partition;
-            this.key = key;
-            this.value = value;
-        }
-
-        /**
-         * Gets the storage service to which an item was added.
-         * 
-         * @return storage service to which an item was added
-         */
-        public StorageService<KeyType, ValueType> getStorageService() {
-            return storageService;
-        }
-
-        /**
-         * Gets the partition to which the entry was added.
-         * 
-         * @return partition to which the entry was added
-         */
-        public String getPartition() {
-            return partition;
-        }
-
-        /**
-         * Gets the key of the added item.
-         * 
-         * @return key of the added item
-         */
-        public KeyType getKey() {
-            return key;
-        }
-
-        /**
-         * Gets the added item.
-         * 
-         * @return added item
-         */
-        public ValueType getValue() {
-            return value;
-        }
-    }
-
-    /** An event indicating an item has been removed from an storage service. */
-    public static class RemoveEntryEvent<KeyType, ValueType> extends ApplicationEvent {
-
-        /** Serial version UID. */
-        private static final long serialVersionUID = 7414605158323325366L;
-
-        /** Storage service to which the item was removed. */
-        private StorageService<KeyType, ValueType> storageService;
-
-        /** Storage partition to which the item was removed. */
-        private String partition;
-
-        /** Key to the removed item. */
-        private KeyType key;
-
-        /** The removed item. */
-        private ValueType value;
-
-        /**
-         * Constructor.
-         * 
-         * @param storageService storage service to which an item was removed
-         * @param partition partition to which the entry was removed
-         * @param key key of the removed item
-         * @param value removed item
-         */
-        public RemoveEntryEvent(StorageService<KeyType, ValueType> storageService, String partition, KeyType key,
-                ValueType value) {
-            super(storageService);
-            this.storageService = storageService;
-            this.partition = partition;
-            this.key = key;
-            this.value = value;
-        }
-
-        /**
-         * Gets the storage service to which an item was removed.
-         * 
-         * @return storage service to which an item was removed
-         */
-        public StorageService<KeyType, ValueType> getStorageService() {
-            return storageService;
-        }
-
-        /**
-         * Gets the partition to which the entry was removed.
-         * 
-         * @return partition to which the entry was removed
-         */
-        public String getPartition() {
-            return partition;
-        }
-
-        /**
-         * Gets the key of the removed item.
-         * 
-         * @return key of the removed item
-         */
-        public KeyType getKey() {
-            return key;
-        }
-
-        /**
-         * Gets the removed item.
-         * 
-         * @return removed item
-         */
-        public ValueType getValue() {
-            return value;
-        }
-    }
-
-    /** An iterator over the partitions of the storage service. */
-    public class PartitionIterator implements Iterator<String> {
-
-        /** Iterator over the partitions in the backing store. */
-        private Iterator<String> partitionItr;
-
-        /** Current partition. */
-        private String currentParition;
-
-        /** Constructor. */
-        public PartitionIterator() {
-            partitionItr = store.keySet().iterator();
-        }
-
-        /** {@inheritDoc} */
-        public boolean hasNext() {
-            return partitionItr.hasNext();
-        }
-
-        /** {@inheritDoc} */
-        public String next() {
-            currentParition = partitionItr.next();
-            return currentParition;
-        }
-
-        /** {@inheritDoc} */
-        public void remove() {
-            Iterator<KeyType> partitionEntries = getKeys(currentParition);
-            while (partitionEntries.hasNext()) {
-                partitionEntries.next();
-                partitionEntries.remove();
-            }
-            store.remove(currentParition);
-        }
-    }
-
-    /** An iterator over the entries of a partition of the storage service. */
-    public class PartitionEntryIterator implements Iterator<KeyType> {
-
-        /** Partition on which we are operating. */
-        private String partition;
-
-        /** Iterator of keys within the partition. */
-        private Iterator<KeyType> keysItr;
-
-        /** Current key within the iteration. */
-        private KeyType currentKey;
-
-        /**
-         * Constructor.
-         * 
-         * @param partition partition upon which this iterator operates
-         */
-        public PartitionEntryIterator(String partition) {
-            this.partition = partition;
-            keysItr = store.get(partition).keySet().iterator();
-        }
-
-        /** {@inheritDoc} */
-        public boolean hasNext() {
-            return keysItr.hasNext();
-        }
-
-        /** {@inheritDoc} */
-        public KeyType next() {
-            currentKey = keysItr.next();
-            return currentKey;
-        }
-
-        /** {@inheritDoc} */
-        public void remove() {
-            EventingMapBasedStorageService.this.remove(partition, currentKey);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/HttpHelper.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/HttpHelper.java.svn-base
deleted file mode 100644
index 656e3f1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/HttpHelper.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Helper class for dealing with HTTP related resoruces.
- */
-public final class HttpHelper {
-    
-    /** Constructor. */
-    private HttpHelper(){
-        
-    }
-
-    /**
-     * Gets the request URI as returned by {@link HttpServletRequest#getRequestURI()} but without the servlet context
-     * path.
-     * 
-     * @param request request to get the URI from
-     * 
-     * @return constructed URI
-     */
-    public static String getRequestUriWithoutContext(HttpServletRequest request) {
-        String servletPath = request.getServletPath();
-
-        if (request.getPathInfo() == null) {
-            return servletPath;
-        } else {
-            return servletPath + request.getPathInfo();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/Slf4JLogChute.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/Slf4JLogChute.java.svn-base
deleted file mode 100644
index 72857f3..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/Slf4JLogChute.java.svn-base
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.log.LogChute;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Redirects Velocity's LogChute messages to SLF4J.
- *
- * <p>To use, first set up SLF4J, then tell Velocity to use
- * this class for logging by adding the following to your velocity.properties:
- *
- * <code>
- * runtime.log.logsystem.class = edu.internet2.middleware.shibboleth.common.util.Slf4jLogChute
- * </code>
- * </p>
- *
- * <p>You may also set this property to specify what log/name Velocity's
- * messages should be logged to (example below is default).
- * <code>
- * runtime.log.logsystem.slf4j.name = org.apache.velocity
- * </code>
- * </p>
- */
-public class Slf4JLogChute implements LogChute {
-
-    /** Property key for specifying the name for the log instance. */
-    public static final String LOGCHUTE_SLF4J_NAME = "runtime.log.logsystem.slf4j.name";
-    
-    /** Default name for the commons-logging instance. */
-    public static final String DEFAULT_LOG_NAME = "org.apache.velocity";
-    
-    /** The Slf4J Logger instance. */
-    protected Logger log;
-    
-    /** {@inheritDoc} */
-    public void init(RuntimeServices rs) throws Exception {
-        String name = (String) rs.getProperty(LOGCHUTE_SLF4J_NAME);
-        if (name == null) {
-            name = DEFAULT_LOG_NAME;
-        }
-        log = LoggerFactory.getLogger(name);
-        log(LogChute.DEBUG_ID, "Slf4JLogChute name is '" + name + "'");
-    }
-
-    /** {@inheritDoc} */
-    public boolean isLevelEnabled(int level) {
-        switch (level) {
-            case LogChute.DEBUG_ID:
-                return log.isDebugEnabled();
-            case LogChute.INFO_ID:
-                return log.isInfoEnabled();
-            case LogChute.TRACE_ID:
-                return log.isTraceEnabled();
-            case LogChute.WARN_ID:
-                return log.isWarnEnabled();
-            case LogChute.ERROR_ID:
-                return log.isErrorEnabled();
-            default:
-                return true;
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void log(int level, String message) {
-        switch (level) {
-            case LogChute.ERROR_ID:
-                log.error(message);
-                break;
-            case LogChute.WARN_ID:
-                log.warn(message);
-                break;
-            case LogChute.INFO_ID:
-                log.info(message);
-                break;
-            case LogChute.TRACE_ID:
-                log.trace(message);
-                break;
-            case LogChute.DEBUG_ID:
-            default:
-                log.debug(message);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void log(int level, String message, Throwable t) {
-        switch (level) {
-            case LogChute.ERROR_ID:
-                log.error(message, t);
-                break;
-            case LogChute.WARN_ID:
-                log.warn(message, t);
-                break;
-            case LogChute.INFO_ID:
-                log.info(message, t);
-                break;
-            case LogChute.TRACE_ID:
-                log.trace(message, t);
-                break;
-            case LogChute.DEBUG_ID:
-            default:
-                log.debug(message, t);
-        }
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/StringResourceLoader.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/StringResourceLoader.java.svn-base
deleted file mode 100644
index d19ae5c..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/StringResourceLoader.java.svn-base
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.collections.ExtendedProperties;
-import org.apache.commons.lang.StringUtils;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.resource.Resource;
-import org.apache.velocity.runtime.resource.loader.ResourceLoader;
-import org.apache.velocity.runtime.resource.util.StringResource;
-import org.apache.velocity.runtime.resource.util.StringResourceRepository;
-import org.apache.velocity.runtime.resource.util.StringResourceRepositoryImpl;
-import org.apache.velocity.util.ClassUtils;
-
-/*
- * This class is a copy of revison 535935 from the Apache Velocity Engine project.  This is included here because 
- * at this time there is no released version of Velocity that contains the fix for bug:
- * https://issues.apache.org/jira/browse/VELOCITY-541
- * 
- * TODO remove this class when the next version of Velocity is available
- */
-
-/**
- * Resource loader that works with Strings. Users should manually add resources to the repository that is used by the
- * resource loader instance.
- * 
- * Below is an example configuration for this loader. Note that 'repository.class' is not necessary; if not provided,
- * the factory will fall back on using {@link StringResourceRepositoryImpl} as the default.
- * 
- * <pre>
- * resource.loader = string
- * string.resource.loader.description = Velocity StringResource loader
- * string.resource.loader.class = org.apache.velocity.runtime.resource.loader.StringResourceLoader
- * string.resource.loader.repository.class = org.apache.velocity.runtime.resource.loader.StringResourceRepositoryImpl
- * </pre>
- * 
- * Resources can be added to the repository like this:
- * 
- * <pre><code>
- * StringResourceRepository repo = StringResourceLoader.getRepository();
- * String myTemplateName = "/some/imaginary/path/hello.vm";
- * String myTemplate = "Hi, ${username}... this is some template!";
- * repo.putStringResource(myTemplateName, myTemplate);
- * </code></pre>
- * 
- * After this, the templates can be retrieved as usual. <br>
- * <p>
- * If there will be multiple StringResourceLoaders used in an application, you should consider specifying a
- * 'string.resource.loader.repository.name = foo' property in order to keep you string resources in a non-default
- * repository. This can help to avoid conflicts between different frameworks or components that are using
- * StringResourceLoader. You can then retrieve your named repository like this:
- * 
- * <pre><code>
- * StringResourceRepository repo = StringResourceLoader.getRepository("foo");
- * </code></pre>
- * 
- * and add string resources to the repo just as in the previous example.
- * </p>
- * <p>
- * If you have concerns about memory leaks or for whatever reason do not wish to have your string repository stored
- * statically as a class member, then you should set 'string.resource.loader.repository.static = false' in your
- * properties. This will tell the resource loader that the string repository should be stored in the Velocity
- * application attributes. To retrieve the repository, do:
- * 
- * <pre><code>
- * StringResourceRepository repo = velocityEngine.getApplicationAttribute("foo");
- * </code></pre>
- * 
- * If you did not specify a name for the repository, then it will be stored under the class name of the repository
- * implementation class (for which the default is
- * 'org.apache.velocity.runtime.resource.util.StringResourceRepositoryImpl'). Incidentally, this is also true for the
- * default statically stored repository.
- * </p>
- * <p>
- * Whether your repository is stored statically or in Velocity's application attributes, you can also manually create
- * and set it prior to Velocity initialization. For a static repository, you can do something like this:
- * 
- * <pre><code>
- * StringResourceRepository repo = new MyStringResourceRepository();
- * repo.magicallyAddSomeStringResources();
- * StringResourceLoader.setRepository("foo", repo);
- * </code></pre>
- * 
- * Or for a non-static repository:
- * 
- * <pre><code>
- * StringResourceRepository repo = new MyStringResourceRepository();
- * repo.magicallyAddSomeStringResources();
- * velocityEngine.setApplicationAttribute("foo", repo);
- * </code></pre>
- * 
- * Then, assuming the 'string.resource.loader.repository.name' property is set to 'some.name', the StringResourceLoader
- * will use that already created repository, rather than creating a new one.
- * </p>
- * 
- * @author <a href="mailto:eelco.hillenius at openedge.nl">Eelco Hillenius</a>
- * @author <a href="mailto:henning at apache.org">Henning P. Schmiedehausen</a>
- * @author Nathan Bubna
- * @version 535935
- */
-public class StringResourceLoader extends ResourceLoader {
-    /** Key to determine whether the repository should be set as the static one or not. */
-    public static final String REPOSITORY_STATIC = "repository.static";
-
-    /** By default, repositories are stored statically (shared across the VM). */
-    public static final boolean REPOSITORY_STATIC_DEFAULT = true;
-
-    /** Key to look up the repository implementation class. */
-    public static final String REPOSITORY_CLASS = "repository.class";
-
-    /** The default implementation class. */
-    public static final String REPOSITORY_CLASS_DEFAULT = StringResourceRepositoryImpl.class.getName();
-
-    /** Key to look up the name for the repository to be used. */
-    public static final String REPOSITORY_NAME = "repository.name";
-
-    /**
-     * The default name for string resource repositories
-     * ('org.apache.velocity.runtime.resource.util.StringResourceRepository').
-     */
-    public static final String REPOSITORY_NAME_DEFAULT = StringResourceRepository.class.getName();
-
-    /** Key to look up the repository char encoding. */
-    public static final String REPOSITORY_ENCODING = "repository.encoding";
-
-    /** The default repository encoding. */
-    public static final String REPOSITORY_ENCODING_DEFAULT = "UTF-8";
-
-    /** Local copy of static repositories. */
-    protected static final Map<String,StringResourceRepository> STATIC_REPOSITORIES =
-            Collections.synchronizedMap(new HashMap());
-
-    /** Repository used internally by this resource loader. */
-    private StringResourceRepository repository;
-    
-    /**
-     * Returns a reference to the default static repository.
-     * 
-     * @return  the default repository
-     */
-    public static StringResourceRepository getRepository() {
-        return getRepository(REPOSITORY_NAME_DEFAULT);
-    }
-
-    /**
-     * Returns a reference to the repository stored statically under the specified name.
-     * 
-     * @param name  name of repository
-     * 
-     * @return  the named repository
-     */
-    public static StringResourceRepository getRepository(String name) {
-        return STATIC_REPOSITORIES.get(name);
-    }
-
-    /**
-     * Sets the specified {@link StringResourceRepository} in static storage under the specified name.
-     * 
-     * @param name  name of repository
-     * @param repo  repository to add
-     */
-    public static void setRepository(String name, StringResourceRepository repo) {
-        STATIC_REPOSITORIES.put(name, repo);
-    }
-
-    /**
-     * Removes the {@link StringResourceRepository} stored under the specified name.
-     * 
-     * @param name  name of repository
-     * 
-     * @return the repository removed
-     */
-    public static StringResourceRepository removeRepository(String name) {
-        return (StringResourceRepository) STATIC_REPOSITORIES.remove(name);
-    }
-
-    /**
-     * Removes all statically stored {@link StringResourceRepository}s.
-     */
-    public static void clearRepositories() {
-        STATIC_REPOSITORIES.clear();
-    }
-
-    /** {@inheritDoc} */
-    public void init(final ExtendedProperties configuration) {
-        log.trace("StringResourceLoader : initialization starting.");
-
-        // get the repository configuration info
-        String repoClass = configuration.getString(REPOSITORY_CLASS, REPOSITORY_CLASS_DEFAULT);
-        String repoName = configuration.getString(REPOSITORY_NAME, REPOSITORY_NAME_DEFAULT);
-        boolean isStatic = configuration.getBoolean(REPOSITORY_STATIC, REPOSITORY_STATIC_DEFAULT);
-        String encoding = configuration.getString(REPOSITORY_ENCODING);
-
-        // look for an existing repository of that name and isStatic setting
-        if (isStatic) {
-            repository = getRepository(repoName);
-            if (repository != null && log.isDebugEnabled()) {
-                log.debug("Loaded repository '" + repoName + "' from static repo store");
-            }
-        } else {
-            repository = (StringResourceRepository) rsvc.getApplicationAttribute(repoName);
-            if (repository != null && log.isDebugEnabled()) {
-                log.debug("Loaded repository '" + repoName + "' from application attributes");
-            }
-        }
-
-        if (repository == null) {
-            // since there's no repository under the repo name, create a new one
-            repository = createRepository(repoClass, encoding);
-
-            // and store it according to the isStatic setting
-            if (isStatic) {
-                setRepository(repoName, this.repository);
-            } else {
-                rsvc.setApplicationAttribute(repoName, this.repository);
-            }
-        } else {
-            // ok, we already have a repo
-            // warn them if they are trying to change the class of the repository
-            if (!repository.getClass().getName().equals(repoClass)) {
-                log.warn("Cannot change class of string repository '" + repoName + "' from "
-                        + repository.getClass().getName() + " to " + repoClass);
-            }
-
-            // allow them to change the default encoding of the repo
-            if (encoding != null && !repository.getEncoding().equals(encoding)) {
-                if (log.isInfoEnabled()) {
-                    log.info("Changing the default encoding of string repository '" + repoName + "' from "
-                            + repository.getEncoding() + " to " + encoding);
-                }
-                repository.setEncoding(encoding);
-            }
-        }
-
-        log.trace("StringResourceLoader : initialization complete.");
-    }
-
-    /**
-     * Create a repository.
-     * 
-     * @param className class of repository to create
-     * @param encoding  encoding for repository
-     * 
-     * @return the newly created repository
-     */
-    public StringResourceRepository createRepository(final String className, final String encoding) {
-        if (log.isDebugEnabled()) {
-            log.debug("Creating string repository using class " + className + "...");
-        }
-
-        StringResourceRepository repo;
-        try {
-            repo = (StringResourceRepository) ClassUtils.getNewInstance(className);
-        } catch (ClassNotFoundException cnfe) {
-            throw new VelocityException("Could not find '" + className + "'", cnfe);
-        } catch (IllegalAccessException iae) {
-            throw new VelocityException("Could not access '" + className + "'", iae);
-        } catch (InstantiationException ie) {
-            throw new VelocityException("Could not instantiate '" + className + "'", ie);
-        }
-
-        if (encoding != null) {
-            repo.setEncoding(encoding);
-        } else {
-            repo.setEncoding(REPOSITORY_ENCODING_DEFAULT);
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("Default repository encoding is " + repo.getEncoding());
-        }
-        return repo;
-    }
-
-    /**
-     * Get an InputStream so that the Runtime can build a template with it.
-     * 
-     * @param name name of template to get.
-     * @return InputStream containing the template.
-     * @throws ResourceNotFoundException Ff template not found in the RepositoryFactory.
-     */
-    public InputStream getResourceStream(final String name) throws ResourceNotFoundException {
-        if (StringUtils.isEmpty(name)) {
-            throw new ResourceNotFoundException("No template name provided");
-        }
-
-        StringResource resource = this.repository.getStringResource(name);
-
-        if (resource == null) {
-            throw new ResourceNotFoundException("Could not locate resource '" + name + "'");
-        }
-
-        byte[] byteArray = null;
-
-        try {
-            byteArray = resource.getBody().getBytes(resource.getEncoding());
-            return new ByteArrayInputStream(byteArray);
-        } catch (UnsupportedEncodingException ue) {
-            throw new VelocityException("Could not convert String using encoding " + resource.getEncoding(), ue);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public boolean isSourceModified(final Resource resource) {
-        StringResource original = null;
-        boolean result = true;
-
-        original = this.repository.getStringResource(resource.getName());
-
-        if (original != null) {
-            result = original.getLastModified() != resource.getLastModified();
-        }
-
-        return result;
-    }
-
-    /** {@inheritDoc} */
-    public long getLastModified(final Resource resource) {
-        StringResource original = null;
-
-        original = this.repository.getStringResource(resource.getName());
-
-        return (original != null) ? original.getLastModified() : 0;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/VelocityStringResourceRepositoryAdaptor.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/VelocityStringResourceRepositoryAdaptor.java.svn-base
deleted file mode 100644
index 79934d7..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/VelocityStringResourceRepositoryAdaptor.java.svn-base
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import java.lang.reflect.Method;
-
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.resource.util.StringResourceRepository;
-
-/**
- * Adaptor class to intercept and route requests from components for the Velocity
- * {@link StringResourceRepository} associated with the particular {@link StringResourceLoader}
- * implementation used by a {@VelocityEngine} instance. This is done via reflection, so that
- * either the legacy "bug fix" copy we included in the library or the up to date version
- * included in newer Velocity versions can be used interchangeably.
- */
-public class VelocityStringResourceRepositoryAdaptor {
-
-    /**
-     * Constructor.
-     */
-    private VelocityStringResourceRepositoryAdaptor() {
-        
-    }
-
-    /**
-     * Returns a reference to the default static repository.
-     * 
-     * @param engine Velocity engine to obtain repository for
-     * 
-     * @return  the applicable repository
-     * @throw VelocityException if the repository cannot be obtained
-     */
-    public static StringResourceRepository getRepository(VelocityEngine engine) {
-        String implClass = engine.getProperty("string.resource.loader.class").toString();
-        if (implClass == null) {
-            throw new VelocityException("Velocity engine did not contain a string.resource.loader.class property");
-        }
-        try {
-            Method m = Class.forName(implClass).getMethod("getRepository", (Class[]) null);
-            return (StringResourceRepository) m.invoke(null, (Object[]) null);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new VelocityException("Exception obtaining StringResourceRepository", e);
-        }
-    }
-
-    /**
-     * Returns a reference to the repository stored statically under the specified name.
-     * 
-     * @param engine Velocity engine to obtain repository for
-     * @param name  name of repository to access
-     * 
-     * @return  the applicable repository
-     * @throw VelocityException if the repository cannot be obtained
-     */
-    public static StringResourceRepository getRepository(VelocityEngine engine, String name) {
-        String implClass = engine.getProperty("string.resource.loader.class").toString();
-        if (implClass == null) {
-            throw new VelocityException("Velocity engine did not contain a string.resource.loader.class property");
-        }
-        try {
-            Method m = Class.forName(implClass).getMethod("getRepository", String.class);
-            return (StringResourceRepository) m.invoke(null, name);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new VelocityException("Exception obtaining StringResourceRepository", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops
deleted file mode 100644
index 56abb71..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 112
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject
-END
-ShibbolethMetadataScope.java
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/ShibbolethMetadataScope.java
-END
-ShibbolethScopedValue.java
-K 25
-svn:wc:ra_dav:version-url
-V 139
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/ShibbolethScopedValue.java
-END
-ShibbolethMetadataKeyAuthority.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/ShibbolethMetadataKeyAuthority.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries
deleted file mode 100644
index 0c767ce..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries
+++ /dev/null
@@ -1,133 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibbolethMetadataScope.java
-file
-
-
-
-
-2014-02-19T17:27:45.498832Z
-5c27122dd3f3dcaca3b51d29a2bf8da6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2778
-

-ShibbolethScopedValue.java
-file
-
-
-
-
-2014-02-19T17:27:45.498832Z
-a6fb2e07ae7e6ec580018b537152891c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2362
-

-impl
-dir
-

-ShibbolethMetadataKeyAuthority.java
-file
-
-
-
-
-2014-02-19T17:27:45.498832Z
-40fc0ee040695c76b30e0c0d478c295a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2348
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethMetadataKeyAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethMetadataKeyAuthority.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethMetadataKeyAuthority.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethMetadataScope.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethMetadataScope.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethMetadataScope.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethScopedValue.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethScopedValue.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/ShibbolethScopedValue.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethMetadataKeyAuthority.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethMetadataKeyAuthority.java.svn-base
deleted file mode 100644
index 7be2171..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethMetadataKeyAuthority.java.svn-base
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.AttributeExtensibleXMLObject;
-import org.opensaml.xml.signature.KeyInfo;
-import org.opensaml.xml.validation.ValidatingXMLObject;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethConstants;
-
-/**
- * Shibboleth SAML metadata extension KeyAuthority element.
- */
-public interface ShibbolethMetadataKeyAuthority extends ValidatingXMLObject, AttributeExtensibleXMLObject {
-    
-    /** Element local name. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "KeyAuthority";
-
-    /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = 
-        new QName(ShibbolethConstants.SHIB_MDEXT10_NS, DEFAULT_ELEMENT_LOCAL_NAME,
-                ShibbolethConstants.SHIB_MDEXT10_PREFIX);
-    
-    /** VerifyDepth attribute name. */
-    public static final String VERIFY_DEPTH_ATTRIB_NAME = "VerifyDepth";
-    
-    /**
-     * Get the list of KeyInfo child elements.
-     * 
-     * @return the list of KeyInfo child elements
-     */
-    public List<KeyInfo> getKeyInfos();
-    
-    /**
-     * Get the VerifyDepth attribute value.
-     * 
-     * @return the VerifyDepth attribute value
-     */
-    public Integer getVerifyDepth();
-    
-    /**
-     * Set the VerifyDepth attribute value.
-     * 
-     * @param newVerifyDepth the new VerifyDepth attribute value
-     */
-    public void setVerifyDepth(Integer newVerifyDepth);
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethMetadataScope.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethMetadataScope.java.svn-base
deleted file mode 100644
index 6984db4..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethMetadataScope.java.svn-base
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject;
-
-import java.util.regex.Pattern;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.schema.XSBooleanValue;
-import org.opensaml.xml.schema.XSString;
-import org.opensaml.xml.validation.ValidatingXMLObject;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethConstants;
-
-/**
- * Shibboleth SAML metadata extension Scope element.
- */
-public interface ShibbolethMetadataScope extends ValidatingXMLObject, XSString {
-
-    /** Element local name. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "Scope";
-
-    /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(ShibbolethConstants.SHIB_MDEXT10_NS,
-            DEFAULT_ELEMENT_LOCAL_NAME, ShibbolethConstants.SHIB_MDEXT10_PREFIX);
-
-    /** regexp attribute name. */
-    public static final String REGEXP_ATTRIB_NAME = "regexp";
-
-    /**
-     * Get the regexp attribute value.
-     * 
-     * @return the regexp attribute value
-     */
-    public Boolean getRegexp();
-
-    /**
-     * Get the regexp attribute value.
-     * 
-     * @return the regexp attribute value
-     */
-    public XSBooleanValue getRegexpXSBoolean();
-
-    /**
-     * Set the regexp attribute value.
-     * 
-     * @param newRegexp the new regexp attribute value
-     */
-    public void setRegexp(Boolean newRegexp);
-
-    /**
-     * Set the regexp attribute value.
-     * 
-     * @param newRegexp the new regexp attribute value
-     */
-    public void setRegexp(XSBooleanValue newRegexp);
-
-    /**
-     * Gets the match pattern used to evaluate if a scope matches the scope criteria given by this extension. If regular
-     * expressions are not used in the scope criteria then this pattern must simply perform a direct match of the
-     * string.
-     * 
-     * @return match pattern used to evaluate if a scope matches the scope criteria
-     */
-    public Pattern getMatchPattern();
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethScopedValue.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethScopedValue.java.svn-base
deleted file mode 100644
index f11d44b..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/ShibbolethScopedValue.java.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.common.SAMLObject;
-
-import edu.internet2.middleware.shibboleth.common.config.attribute.encoding.AttributeEncoderNamespaceHandler;
-
-/**
- * Represents a string value that contains an attribute containing a scope.
- */
-public interface ShibbolethScopedValue extends SAMLObject {
-
-    /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "ScopedValue";
-
-    /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(AttributeEncoderNamespaceHandler.NAMESPACE, TYPE_LOCAL_NAME,
-            "encoder");
-
-    /**
-     * Gets the name of the scope attribute.
-     * 
-     * @return name of the scope attribute
-     */
-    public String getScopeAttributeName();
-
-    /**
-     * Sets the name of the scope attribute.
-     * 
-     * @param attribute name of the scope attribute
-     */
-    public void setScopeAttributeName(String attribute);
-
-    /**
-     * Gets the scope value.
-     * 
-     * @return scope value
-     */
-    public String getScope();
-
-    /**
-     * Sets the scope value.
-     * 
-     * @param scope scope value
-     */
-    public void setScope(String scope);
-
-    /**
-     * Set the attribute value.
-     * 
-     * @param newContent the new attribute value
-     */
-    public void setValue(String newContent);
-
-    /**
-     * Get the attribute value.
-     * 
-     * @return the attribute value.
-     */
-    public String getValue();
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops
deleted file mode 100644
index 5d473f6..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops
+++ /dev/null
@@ -1,77 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 117
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl
-END
-ShibbolethMetadataKeyAuthorityImpl.java
-K 25
-svn:wc:ra_dav:version-url
-V 157
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataKeyAuthorityImpl.java
-END
-ShibbolethMetadataScopeMarshaller.java
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataScopeMarshaller.java
-END
-ShibbolethScopedValueMarshaller.java
-K 25
-svn:wc:ra_dav:version-url
-V 154
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethScopedValueMarshaller.java
-END
-ShibbolethMetadataScopeUnmarshaller.java
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataScopeUnmarshaller.java
-END
-ShibbolethScopedValueUnmarshaller.java
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethScopedValueUnmarshaller.java
-END
-ShibbolethMetadataKeyAuthorityBuilder.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataKeyAuthorityBuilder.java
-END
-ShibbolethMetadataScopeImpl.java
-K 25
-svn:wc:ra_dav:version-url
-V 150
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataScopeImpl.java
-END
-ShibbolethScopedValueImpl.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethScopedValueImpl.java
-END
-ShibbolethMetadataKeyAuthorityMarshaller.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataKeyAuthorityMarshaller.java
-END
-ShibbolethMetadataKeyAuthorityUnmarshaller.java
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataKeyAuthorityUnmarshaller.java
-END
-ShibbolethMetadataScopeBuilder.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethMetadataScopeBuilder.java
-END
-ShibbolethScopedValueBuilder.java
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/982/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibbolethScopedValueBuilder.java
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries
deleted file mode 100644
index def1371..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries
+++ /dev/null
@@ -1,436 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibbolethMetadataScopeUnmarshaller.java
-file
-
-
-
-
-2014-02-19T17:27:45.494832Z
-41995630dc3a9548191c86f7b2e83387
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2512
-

-ShibbolethScopedValueUnmarshaller.java
-file
-
-
-
-
-2014-02-19T17:27:45.494832Z
-a5c6a911d492a223a500700c56db4a21
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2200
-

-ShibbolethMetadataKeyAuthorityBuilder.java
-file
-
-
-
-
-2014-02-19T17:27:45.494832Z
-0c30b11564d246f1a2128a62feb5ab80
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2010
-

-ShibbolethMetadataScopeImpl.java
-file
-
-
-
-
-2014-02-19T17:27:45.490832Z
-af9699c0d065012e6953231c482cbc51
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3283
-

-ShibbolethScopedValueImpl.java
-file
-
-
-
-
-2014-02-19T17:27:45.490832Z
-7b7b71771afaf995089b56d7fd3c058a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3099
-

-ShibbolethMetadataKeyAuthorityMarshaller.java
-file
-
-
-
-
-2014-02-19T17:27:45.490832Z
-72b99c1b262841fa5903614627fb2fdf
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3302
-

-ShibbolethMetadataKeyAuthorityUnmarshaller.java
-file
-
-
-
-
-2014-02-19T17:27:45.490832Z
-083854ff5f44455ba90c8fffeb4fd611
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3087
-

-ShibbolethMetadataScopeBuilder.java
-file
-
-
-
-
-2014-02-19T17:27:45.490832Z
-c3edbfb2a12f63f19110ae3cdb220c4a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1924
-

-ShibbolethScopedValueBuilder.java
-file
-
-
-
-
-2014-02-19T17:27:45.490832Z
-e87859ecb8146f2ef7ca7b1eda8d16df
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1462
-

-ShibbolethMetadataKeyAuthorityImpl.java
-file
-
-
-
-
-2014-02-19T17:27:45.490832Z
-564ea654f53aecc258c14d58a5e4446f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3152
-

-ShibbolethMetadataScopeMarshaller.java
-file
-
-
-
-
-2014-02-19T17:27:45.494832Z
-c46f3bf4535a2afc1cb3e9eb4669d823
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2668
-

-ShibbolethScopedValueMarshaller.java
-file
-
-
-
-
-2014-02-19T17:27:45.494832Z
-4aa0797be07f812082eb6e24ea3439d6
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2054
-

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityBuilder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityBuilder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityBuilder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityImpl.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityImpl.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityImpl.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityMarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityMarshaller.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityMarshaller.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityUnmarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityUnmarshaller.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataKeyAuthorityUnmarshaller.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeBuilder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeBuilder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeBuilder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeImpl.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeImpl.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeImpl.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeMarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeMarshaller.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeMarshaller.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeUnmarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeUnmarshaller.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethMetadataScopeUnmarshaller.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueBuilder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueBuilder.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueBuilder.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueImpl.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueImpl.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueImpl.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueMarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueMarshaller.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueMarshaller.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueUnmarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueUnmarshaller.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibbolethScopedValueUnmarshaller.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityBuilder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityBuilder.java.svn-base
deleted file mode 100644
index dc96515..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityBuilder.java.svn-base
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.AbstractXMLObjectBuilder;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethConstants;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataKeyAuthority;
-
-/**
- * Builder of {@link ShibbolethMetadataKeyAuthority} objects.
- */
-public class ShibbolethMetadataKeyAuthorityBuilder extends AbstractXMLObjectBuilder<ShibbolethMetadataKeyAuthority> {
-
-    /** {@inheritDoc} */
-    public ShibbolethMetadataKeyAuthority buildObject(String namespaceURI, String localName, String namespacePrefix) {
-        return new ShibbolethMetadataKeyAuthorityImpl(namespaceURI, localName, namespacePrefix);
-    }
-    
-    /**
-     * Build a KeyAuthority element with the default namespace prefix and element name.
-     * 
-     * @return a new instance of ShibbolethMetadataKeyAuthority
-     */
-    public ShibbolethMetadataKeyAuthority buildObject() {
-        return buildObject(ShibbolethConstants.SHIB_MDEXT10_NS,
-                ShibbolethMetadataKeyAuthority.DEFAULT_ELEMENT_LOCAL_NAME,
-                ShibbolethConstants.SHIB_MDEXT10_PREFIX);
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityImpl.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityImpl.java.svn-base
deleted file mode 100644
index 3e41fa2..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityImpl.java.svn-base
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.signature.KeyInfo;
-import org.opensaml.xml.util.AttributeMap;
-import org.opensaml.xml.util.XMLObjectChildrenList;
-import org.opensaml.xml.validation.AbstractValidatingXMLObject;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataKeyAuthority;
-
-/**
- * Implementation of {@link ShibbolethMetadataKeyAuthority}.
- */
-public class ShibbolethMetadataKeyAuthorityImpl extends AbstractValidatingXMLObject implements
-        ShibbolethMetadataKeyAuthority {
-    
-    /** The list of KeyInfo child elements. */
-    private final List<KeyInfo> keyInfos;
-    
-    /** The VerifyDepth attribute. */
-    private Integer verifyDepth;
-    
-    /** Wildcard, unknown 'anyAttribute' attributes. */
-    private AttributeMap unknownAttributes;
-
-    /**
-     * Constructor.
-     *
-     * @param namespaceURI the namespace the element is in
-     * @param elementLocalName the local name of the XML element this Object represents
-     * @param namespacePrefix the prefix for the given namespace
-     */
-    protected ShibbolethMetadataKeyAuthorityImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
-        super(namespaceURI, elementLocalName, namespacePrefix);
-        keyInfos = new XMLObjectChildrenList<KeyInfo>(this);
-        unknownAttributes = new AttributeMap(this);
-    }
-
-    /** {@inheritDoc} */
-    public List<KeyInfo> getKeyInfos() {
-        return keyInfos;
-    }
-
-    /** {@inheritDoc} */
-    public Integer getVerifyDepth() {
-        return verifyDepth;
-    }
-
-    /** {@inheritDoc} */
-    public void setVerifyDepth(Integer newVerifyDepth) {
-        verifyDepth = prepareForAssignment(verifyDepth, newVerifyDepth);
-    }
-
-    /** {@inheritDoc} */
-    public AttributeMap getUnknownAttributes() {
-        return unknownAttributes;
-    }
-
-    /** {@inheritDoc} */
-    public List<XMLObject> getOrderedChildren() {
-        if (keyInfos.isEmpty()) {
-            return null;
-        }
-        ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-        children.addAll(keyInfos);
-        return Collections.unmodifiableList(children);
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityMarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityMarshaller.java.svn-base
deleted file mode 100644
index 476c07a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityMarshaller.java.svn-base
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import java.util.Map.Entry;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.Configuration;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.io.AbstractXMLObjectMarshaller;
-import org.opensaml.xml.io.MarshallingException;
-import org.opensaml.xml.util.XMLHelper;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethConstants;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataKeyAuthority;
-
-/**
- * A thread-safe Marshaller for {@link ShibbolethMetadataKeyAuthority}.
- */
-public class ShibbolethMetadataKeyAuthorityMarshaller extends AbstractXMLObjectMarshaller {
-    
-    /** Constructor. */
-    public ShibbolethMetadataKeyAuthorityMarshaller() {
-        super(ShibbolethConstants.SHIB_MDEXT10_NS, ShibbolethMetadataKeyAuthority.DEFAULT_ELEMENT_LOCAL_NAME);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     */
-    protected ShibbolethMetadataKeyAuthorityMarshaller(String namespaceURI, String elementLocalName) {
-        super(namespaceURI, elementLocalName);
-    }
-
-    /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
-        ShibbolethMetadataKeyAuthority keyAuthority = (ShibbolethMetadataKeyAuthority) xmlObject;
-        
-        if (keyAuthority.getVerifyDepth() != null) {
-            domElement.setAttributeNS(null, ShibbolethMetadataKeyAuthority.VERIFY_DEPTH_ATTRIB_NAME, 
-                    keyAuthority.getVerifyDepth().toString());
-        }
-        
-        Attr attr;
-        for(Entry<QName, String> entry: keyAuthority.getUnknownAttributes().entrySet()){
-            attr = XMLHelper.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
-            attr.setValue(entry.getValue());
-            domElement.setAttributeNodeNS(attr);
-            if (Configuration.isIDAttribute(entry.getKey()) 
-                    || keyAuthority.getUnknownAttributes().isIDAttribute(entry.getKey())) {
-                attr.getOwnerElement().setIdAttributeNode(attr, true);
-            }
-        }
-
-    }
-
-    /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
-        // nothing to implement
-    }
-
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityUnmarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityUnmarshaller.java.svn-base
deleted file mode 100644
index ec89315..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataKeyAuthorityUnmarshaller.java.svn-base
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.io.AbstractXMLObjectUnmarshaller;
-import org.opensaml.xml.io.UnmarshallingException;
-import org.opensaml.xml.signature.KeyInfo;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Attr;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataKeyAuthority;
-
-/**
- * A thread-safe Unmarshaller for {@link ShibbolethMetadataKeyAuthority}.
- */
-public class ShibbolethMetadataKeyAuthorityUnmarshaller extends AbstractXMLObjectUnmarshaller {
-    
-    /** Logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethMetadataKeyAuthorityUnmarshaller.class);
-
-    /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
-        ShibbolethMetadataKeyAuthority authority = (ShibbolethMetadataKeyAuthority) xmlObject;
-        
-        if (attribute.getLocalName().equals(ShibbolethMetadataKeyAuthority.VERIFY_DEPTH_ATTRIB_NAME)) {
-            authority.setVerifyDepth(Integer.valueOf(attribute.getValue()));
-        } else {
-            QName attribQName = XMLHelper.getNodeQName(attribute);
-            if (attribute.isId()) {
-               authority.getUnknownAttributes().registerID(attribQName);
-            }
-            authority.getUnknownAttributes().put(attribQName, attribute.getValue());
-        }
-
-    }
-
-    /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
-            throws UnmarshallingException {
-        ShibbolethMetadataKeyAuthority authority = (ShibbolethMetadataKeyAuthority) parentXMLObject;
-        
-        if (childXMLObject instanceof KeyInfo) {
-            authority.getKeyInfos().add((KeyInfo) childXMLObject);
-        } else {
-            log.debug("Ignorning unknown child element {}", childXMLObject.getElementQName());
-        }
-
-    }
-
-    /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
-        log.debug("Ignorning unsupported element text content");
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeBuilder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeBuilder.java.svn-base
deleted file mode 100644
index 51d380a..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeBuilder.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.AbstractXMLObjectBuilder;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethConstants;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataScope;
-
-/**
- * Builder of {@link ShibbolethMetadataScope} objects.
- */
-public class ShibbolethMetadataScopeBuilder extends AbstractXMLObjectBuilder<ShibbolethMetadataScope> {
-
-    /** {@inheritDoc} */
-    public ShibbolethMetadataScope buildObject(String namespaceURI, String localName, String namespacePrefix) {
-        return new ShibbolethMetadataScopeImpl(namespaceURI, localName, namespacePrefix);
-    }
-    
-    /**
-     * Build a Scope element with the default namespace prefix and element name.
-     * 
-     * @return a new instance of ShibbolethMetadataScope
-     */
-    public ShibbolethMetadataScope buildObject() {
-        return buildObject(ShibbolethConstants.SHIB_MDEXT10_NS, ShibbolethMetadataScope.DEFAULT_ELEMENT_LOCAL_NAME,
-                ShibbolethConstants.SHIB_MDEXT10_PREFIX);
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeImpl.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeImpl.java.svn-base
deleted file mode 100644
index 22dab81..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeImpl.java.svn-base
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.schema.XSBooleanValue;
-import org.opensaml.xml.validation.AbstractValidatingXMLObject;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataScope;
-
-/**
- * Implementation of {@link ShibbolethMetadataScope}.
- */
-public class ShibbolethMetadataScopeImpl extends AbstractValidatingXMLObject implements ShibbolethMetadataScope {
-
-    /** The regexp attribute value. */
-    private XSBooleanValue regexp;
-
-    /** The string content value. */
-    private String scopeValue;
-
-    /** Pattern used to match scopes against criteria. */
-    private Pattern matchPattern;
-
-    /**
-     * Constructor.
-     * 
-     * @param namespaceURI the namespace the element is in
-     * @param elementLocalName the local name of the XML element this Object represents
-     * @param namespacePrefix the prefix for the given namespace
-     */
-    protected ShibbolethMetadataScopeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
-        super(namespaceURI, elementLocalName, namespacePrefix);
-        regexp = null;
-    }
-
-    /** {@inheritDoc} */
-    public Boolean getRegexp() {
-        if (regexp == null) {
-            return Boolean.FALSE;
-        }
-        return regexp.getValue();
-    }
-
-    /** {@inheritDoc} */
-    public void setRegexp(Boolean newRegexp) {
-        if (newRegexp != null) {
-            regexp = prepareForAssignment(regexp, new XSBooleanValue(newRegexp, false));
-        } else {
-            regexp = prepareForAssignment(regexp, null);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public XSBooleanValue getRegexpXSBoolean() {
-        return regexp;
-    }
-
-    /** {@inheritDoc} */
-    public void setRegexp(XSBooleanValue newRegexp) {
-        regexp = prepareForAssignment(regexp, newRegexp);
-    }
-
-    /** {@inheritDoc} */
-    public String getValue() {
-        return scopeValue;
-    }
-
-    /** {@inheritDoc} */
-    public void setValue(String newScopeValue) {
-        scopeValue = prepareForAssignment(scopeValue, newScopeValue);
-        matchPattern = Pattern.compile(scopeValue);
-    }
-
-    /** {@inheritDoc} */
-    public Pattern getMatchPattern() {
-        return matchPattern;
-    }
-
-    /** {@inheritDoc} */
-    public List<XMLObject> getOrderedChildren() {
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeMarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeMarshaller.java.svn-base
deleted file mode 100644
index d441528..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeMarshaller.java.svn-base
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.io.AbstractXMLObjectMarshaller;
-import org.opensaml.xml.io.MarshallingException;
-import org.opensaml.xml.util.XMLHelper;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.ShibbolethConstants;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataScope;
-
-/**
- * A thread-safe Marshaller for {@link ShibbolethMetadataScope}.
- */
-public class ShibbolethMetadataScopeMarshaller extends AbstractXMLObjectMarshaller {
-    
-    /** Constructor. */
-    public ShibbolethMetadataScopeMarshaller() {
-        super(ShibbolethConstants.SHIB_MDEXT10_NS, ShibbolethMetadataScope.DEFAULT_ELEMENT_LOCAL_NAME);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     */
-    protected ShibbolethMetadataScopeMarshaller(String namespaceURI, String elementLocalName) {
-        super(namespaceURI, elementLocalName);
-    }
-
-    /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
-        ShibbolethMetadataScope scope = (ShibbolethMetadataScope) xmlObject;
-        
-        if (scope.getRegexpXSBoolean() != null) {
-            domElement.setAttributeNS(null, ShibbolethMetadataScope.REGEXP_ATTRIB_NAME,
-                    scope.getRegexpXSBoolean().toString());
-        }
-
-    }
-
-    /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
-        ShibbolethMetadataScope shibMDScope = (ShibbolethMetadataScope) xmlObject;
-        
-        XMLHelper.appendTextContent(domElement, shibMDScope.getValue());
-    }
-
-}
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeUnmarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeUnmarshaller.java.svn-base
deleted file mode 100644
index 1e6a427..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethMetadataScopeUnmarshaller.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.io.AbstractXMLObjectUnmarshaller;
-import org.opensaml.xml.io.UnmarshallingException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Attr;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataScope;
-
-/**
- * A thread-safe Unmarshaller for {@link ShibbolethMetadataScope}.
- */
-public class ShibbolethMetadataScopeUnmarshaller extends AbstractXMLObjectUnmarshaller {
-    
-    /** Logger. */
-    private final Logger log = LoggerFactory.getLogger(ShibbolethMetadataScopeUnmarshaller.class);
-
-    /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
-        ShibbolethMetadataScope scope = (ShibbolethMetadataScope) xmlObject;
-        
-        if (attribute.getLocalName().equals(ShibbolethMetadataScope.REGEXP_ATTRIB_NAME)) {
-            scope.setRegexp(Boolean.valueOf(attribute.getValue()));
-        } else {
-            log.debug("Ignorning unknown attribute {}", attribute.getLocalName());
-        }
-        
-    }
-
-    /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
-            throws UnmarshallingException {
-        log.debug("Ignorning unknown child element {}", childXMLObject.getElementQName());
-    }
-
-    /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
-        ShibbolethMetadataScope scope = (ShibbolethMetadataScope) xmlObject;
-        scope.setValue(elementContent);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueBuilder.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueBuilder.java.svn-base
deleted file mode 100644
index f89adf9..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueBuilder.java.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.AbstractXMLObjectBuilder;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethScopedValue;
-
-/**
- * Builder of {@link org.opensaml.xml.schema.impl.XSStringImpl} objects.
- */
-public class ShibbolethScopedValueBuilder extends AbstractXMLObjectBuilder<ShibbolethScopedValue> {
-
-    /** {@inheritDoc} */
-    public ShibbolethScopedValue buildObject(String namespaceURI, String localName, String namespacePrefix) {
-        return new ShibbolethScopedValueImpl(namespaceURI, localName, namespacePrefix);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueImpl.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueImpl.java.svn-base
deleted file mode 100644
index 5df7d19..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueImpl.java.svn-base
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.schema.impl.XSAnyImpl;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethScopedValue;
-
-/**
- * Concrete implementation of {@link org.opensaml.xml.schema.XSString}.
- */
-public class ShibbolethScopedValueImpl extends XSAnyImpl implements ShibbolethScopedValue {
-
-    /** Scope of this string element. */
-    private String scope;
-
-    /** Scope attribute name for this element. */
-    private String scopeAttributeName;
-
-    /**
-     * Constructor.
-     * 
-     * @param namespaceURI the namespace the element is in
-     * @param elementLocalName the local name of the XML element this Object represents
-     * @param namespacePrefix the prefix for the given namespace
-     */
-    protected ShibbolethScopedValueImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
-        super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-
-    /** {@inheritDoc} */
-    public String getScope() {
-        return scope;
-    }
-
-    /** {@inheritDoc} */
-    public String getScopeAttributeName() {
-        return scopeAttributeName;
-    }
-
-    /** {@inheritDoc} */
-    public void setScope(String newScope) {
-        scope = prepareForAssignment(scope, newScope);
-        if (scope != null && scopeAttributeName != null) {
-            getUnknownAttributes().put(new QName(scopeAttributeName), scope);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void setScopeAttributeName(String newScopeAttributeName) {
-        if (scopeAttributeName != null) {
-            QName oldName = new QName(scopeAttributeName);
-            if (getUnknownAttributes().containsKey(oldName)) {
-                getUnknownAttributes().remove(oldName);
-            }
-        }
-
-        scopeAttributeName = prepareForAssignment(scopeAttributeName, newScopeAttributeName);
-        
-        if (scope != null) {
-            getUnknownAttributes().put(new QName(scopeAttributeName), scope);
-        }
-    }
-
-    /** {@inheritDoc} */
-    public String getValue() {
-        return getTextContent();
-    }
-
-    /** {@inheritDoc} */
-    public void setValue(String newValue) {
-        setTextContent(newValue);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueMarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueMarshaller.java.svn-base
deleted file mode 100644
index ee5d363..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueMarshaller.java.svn-base
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.io.AbstractXMLObjectMarshaller;
-import org.opensaml.xml.io.MarshallingException;
-import org.opensaml.xml.util.XMLHelper;
-import org.w3c.dom.Element;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethScopedValue;
-
-/**
- * Thread-safe marshaller of {@link ShibbolethScopedValue} objects.
- */
-public class ShibbolethScopedValueMarshaller extends AbstractXMLObjectMarshaller {
-
-    /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
-        ShibbolethScopedValue scopedValue = (ShibbolethScopedValue) xmlObject;
-
-        if (null != scopedValue.getScopeAttributeName()) {
-            domElement.setAttribute(scopedValue.getScopeAttributeName(), scopedValue.getScope());
-        }
-
-    }
-
-    /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
-        ShibbolethScopedValue scopedValue = (ShibbolethScopedValue) xmlObject;
-
-        XMLHelper.appendTextContent(domElement, scopedValue.getValue());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueUnmarshaller.java.svn-base b/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueUnmarshaller.java.svn-base
deleted file mode 100644
index 3efaab1..0000000
--- a/src/main/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibbolethScopedValueUnmarshaller.java.svn-base
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.io.AbstractXMLObjectUnmarshaller;
-import org.opensaml.xml.io.UnmarshallingException;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.w3c.dom.Attr;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethScopedValue;
-
-/**
- * Thread-safe unmarshaller for {@link org.opensaml.xml.schema.XSString} objects.
- */
-public class ShibbolethScopedValueUnmarshaller extends AbstractXMLObjectUnmarshaller {
-
-    /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
-            throws UnmarshallingException {
-        // no children
-    }
-
-    /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
-        ShibbolethScopedValue sv = (ShibbolethScopedValue) xmlObject;
-
-        if (DatatypeHelper.isEmpty(sv.getScopeAttributeName())) {
-            sv.setScopeAttributeName(attribute.getName());
-            sv.setScope(attribute.getValue());
-        }
-
-    }
-
-    /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
-        ShibbolethScopedValue sv = (ShibbolethScopedValue) xmlObject;
-
-        sv.setValue(elementContent);
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/.svn/all-wcprops b/src/main/resources/.svn/all-wcprops
deleted file mode 100644
index 52c162b..0000000
--- a/src/main/resources/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/java-shib-common/!svn/ver/1088/branches/REL_1/src/main/resources
-END
-shibboleth-saml-ext-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 95
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/shibboleth-saml-ext-config.xml
-END
diff --git a/src/main/resources/.svn/entries b/src/main/resources/.svn/entries
deleted file mode 100644
index 7fcd60f..0000000
--- a/src/main/resources/.svn/entries
+++ /dev/null
@@ -1,68 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/resources
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-12-18T01:03:02.768787Z
-1088
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-shibboleth-saml-ext-config.xml
-file
-
-
-
-
-2014-02-19T17:27:46.230846Z
-8ebb939099fd4f0cc07ad4608157cbea
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1962
-

-META-INF
-dir
-

-schema
-dir
-

diff --git a/src/main/resources/.svn/prop-base/shibboleth-saml-ext-config.xml.svn-base b/src/main/resources/.svn/prop-base/shibboleth-saml-ext-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/.svn/prop-base/shibboleth-saml-ext-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/.svn/text-base/shibboleth-saml-ext-config.xml.svn-base b/src/main/resources/.svn/text-base/shibboleth-saml-ext-config.xml.svn-base
deleted file mode 100644
index aaf728c..0000000
--- a/src/main/resources/.svn/text-base/shibboleth-saml-ext-config.xml.svn-base
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns="http://www.opensaml.org/xmltooling-config" xsi:schemaLocation="http://www.opensaml.org/xmltooling-config ../../src/schema/xmltooling-config.xsd">
-
-	<!-- Shibboleth SAML Metadata Extensions Object providers -->
-	<ObjectProviders>
-
-		<!-- Scope provider -->
-		<ObjectProvider qualifiedName="shibmd:Scope">
-			<BuilderClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethMetadataScopeBuilder"/>
-			<MarshallingClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethMetadataScopeMarshaller"/>
-			<UnmarshallingClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethMetadataScopeUnmarshaller"/>
-		</ObjectProvider>
-		
-		<!-- KeyAuthority provider -->
-		<ObjectProvider qualifiedName="shibmd:KeyAuthority">
-			<BuilderClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethMetadataKeyAuthorityBuilder"/>
-			<MarshallingClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethMetadataKeyAuthorityMarshaller"/>
-			<UnmarshallingClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethMetadataKeyAuthorityUnmarshaller"/>
-		</ObjectProvider>
-        
-        <ObjectProvider qualifiedName="encoder:ScopedValue">
-            <BuilderClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethScopedValueBuilder"/>
-            <MarshallingClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethScopedValueMarshaller"/>
-            <UnmarshallingClass className="edu.internet2.middleware.shibboleth.common.xmlobject.impl.ShibbolethScopedValueUnmarshaller"/>
-        </ObjectProvider>
-		
-	</ObjectProviders>
-</XMLTooling>
diff --git a/src/main/resources/META-INF/.svn/all-wcprops b/src/main/resources/META-INF/.svn/all-wcprops
deleted file mode 100644
index 29480da..0000000
--- a/src/main/resources/META-INF/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/java-shib-common/!svn/ver/740/branches/REL_1/src/main/resources/META-INF
-END
-spring.schemas
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/java-shib-common/!svn/ver/740/branches/REL_1/src/main/resources/META-INF/spring.schemas
-END
-spring.handlers
-K 25
-svn:wc:ra_dav:version-url
-V 89
-/java-shib-common/!svn/ver/740/branches/REL_1/src/main/resources/META-INF/spring.handlers
-END
diff --git a/src/main/resources/META-INF/.svn/entries b/src/main/resources/META-INF/.svn/entries
deleted file mode 100644
index 72054f2..0000000
--- a/src/main/resources/META-INF/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/resources/META-INF
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2008-04-12T16:02:14.997005Z
-733
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-spring.handlers
-file
-
-
-
-
-2014-02-19T17:27:45.942840Z
-6884684886fa9d6a03a542c7dbdc0419
-2008-04-12T16:02:14.997005Z
-733
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2309
-

-spring.schemas
-file
-
-
-
-
-2014-02-19T17:27:45.942840Z
-c2449eca46f360990116a7c12030b87d
-2008-04-12T16:02:14.997005Z
-733
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1343
-

diff --git a/src/main/resources/META-INF/.svn/text-base/spring.handlers.svn-base b/src/main/resources/META-INF/.svn/text-base/spring.handlers.svn-base
deleted file mode 100644
index 534da58..0000000
--- a/src/main/resources/META-INF/.svn/text-base/spring.handlers.svn-base
+++ /dev/null
@@ -1,16 +0,0 @@
-urn\:mace\:shibboleth\:2.0\:afp = edu.internet2.middleware.shibboleth.common.config.attribute.filtering.AttributeFilterNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:afp\:mf\:basic = edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.basic.BasicMatchFunctorNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:afp\:mf\:saml = edu.internet2.middleware.shibboleth.common.config.attribute.filtering.match.saml.SAMLMatchFunctorNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:attribute\:encoder = edu.internet2.middleware.shibboleth.common.config.attribute.encoding.AttributeEncoderNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:attribute\:authority = edu.internet2.middleware.shibboleth.common.config.attribute.authority.AttributeAuthorityNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:metadata = edu.internet2.middleware.shibboleth.common.config.metadata.MetadataNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:relying-party = edu.internet2.middleware.shibboleth.common.config.relyingparty.RelyingPartyNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:relying-party\:saml = edu.internet2.middleware.shibboleth.common.config.relyingparty.saml.SAMLRelyingPartyNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:resolver = edu.internet2.middleware.shibboleth.common.config.attribute.resolver.AttributeResolverNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:resolver\:ad = edu.internet2.middleware.shibboleth.common.config.attribute.resolver.attributeDefinition.AttributeDefinitionNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:resolver\:dc = edu.internet2.middleware.shibboleth.common.config.attribute.resolver.dataConnector.DataConnectorNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:resolver\:pc = edu.internet2.middleware.shibboleth.common.config.attribute.resolver.principalConnector.PrincipalConnectorNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:resource =  edu.internet2.middleware.shibboleth.common.config.resource.ResourceNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:security = edu.internet2.middleware.shibboleth.common.config.security.SecurityNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:security\:saml = edu.internet2.middleware.shibboleth.common.config.security.saml.SAMLSecurityNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:services = edu.internet2.middleware.shibboleth.common.config.service.ServiceNamespaceHandler
\ No newline at end of file
diff --git a/src/main/resources/META-INF/.svn/text-base/spring.schemas.svn-base b/src/main/resources/META-INF/.svn/text-base/spring.schemas.svn-base
deleted file mode 100644
index ebaa56a..0000000
--- a/src/main/resources/META-INF/.svn/text-base/spring.schemas.svn-base
+++ /dev/null
@@ -1,16 +0,0 @@
-urn\:mace\:shibboleth\:2.0\:afp = schema/shibboleth-2.0-afp.xsd
-urn\:mace\:shibboleth\:2.0\:afp\:mf\:basic = schema/shibboleth-2.0-afp-mf-basic.xsd
-urn\:mace\:shibboleth\:2.0\:afp\:mf\:saml = schema/shibboleth-2.0-afp-mf-saml.xsd
-urn\:mace\:shibboleth\:2.0\:attribute\:encoder = schema/shibboleth-2.0-attribute-encoder.xsd
-urn\:mace\:shibboleth\:2.0\:attribute\:authority = schema/shibboleth-2.0-attribute-authority.xsd
-urn\:mace\:shibboleth\:2.0\:metadata = schema/shibboleth-2.0-metadata.xsd
-urn\:mace\:shibboleth\:2.0\:relying-party = schema/shibboleth-2.0-relying-party.xsd
-urn\:mace\:shibboleth\:2.0\:relying-party\:saml = schema/shibboleth-2.0-relying-party-saml.xsd
-urn\:mace\:shibboleth\:2.0\:resolver = schema/shibboleth-2.0-attribute-resolver.xsd
-urn\:mace\:shibboleth\:2.0\:resolver\:ad = schema/shibboleth-2.0-attribute-resolver-ad.xsd
-urn\:mace\:shibboleth\:2.0\:resolver\:dc = schema/shibboleth-2.0-attribute-resolver-dc.xsd
-urn\:mace\:shibboleth\:2.0\:resolver\:pc = schema/shibboleth-2.0-attribute-resolver-pc.xsd
-urn\:mace\:shibboleth\:2.0\:resource = schema/shibboleth-2.0-resource.xsd
-urn\:mace\:shibboleth\:2.0\:security = schema/shibboleth-2.0-security.xsd
-urn\:mace\:shibboleth\:2.0\:security\:saml = schema/shibboleth-2.0-security-policy-saml.xsd
-urn\:mace\:shibboleth\:2.0\:services = schema/shibboleth-2.0-services.xsd
\ No newline at end of file
diff --git a/src/main/resources/schema/.svn/all-wcprops b/src/main/resources/schema/.svn/all-wcprops
deleted file mode 100644
index a6935a5..0000000
--- a/src/main/resources/schema/.svn/all-wcprops
+++ /dev/null
@@ -1,119 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/java-shib-common/!svn/ver/1088/branches/REL_1/src/main/resources/schema
-END
-shibboleth-2.0-security-policy-saml.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 111
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-security-policy-saml.xsd
-END
-shibboleth-2.0-relying-party-saml.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/java-shib-common/!svn/ver/1088/branches/REL_1/src/main/resources/schema/shibboleth-2.0-relying-party-saml.xsd
-END
-shibboleth-2.0-afp-mf-saml.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 103
-/java-shib-common/!svn/ver/1063/branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp-mf-saml.xsd
-END
-shibboleth-2.0-attribute-resolver.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 109
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-resolver.xsd
-END
-shibboleth-2.0-attribute-resolver-pc.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 113
-/java-shib-common/!svn/ver/1073/branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-resolver-pc.xsd
-END
-shibboleth-2.0-relying-party.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 104
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-relying-party.xsd
-END
-shibboleth-2.0-afp.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 94
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp.xsd
-END
-shibboleth-2.0-security.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 100
-/java-shib-common/!svn/ver/1053/branches/REL_1/src/main/resources/schema/shibboleth-2.0-security.xsd
-END
-shibboleth-2.0-profile-handler.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 106
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-profile-handler.xsd
-END
-shibboleth-2.0-attribute-map.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 104
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-map.xsd
-END
-shibboleth-metadata-1.0.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 99
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-metadata-1.0.xsd
-END
-shibboleth-2.0-metadata.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 99
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-metadata.xsd
-END
-shibboleth-2.0-attribute-encoder.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 108
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-encoder.xsd
-END
-shibboleth-2.0-services.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 99
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-services.xsd
-END
-shibboleth-2.0-attribute-resolver-ad.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 112
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-resolver-ad.xsd
-END
-shibboleth-2.0-afp-mf-basic.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 104
-/java-shib-common/!svn/ver/1021/branches/REL_1/src/main/resources/schema/shibboleth-2.0-afp-mf-basic.xsd
-END
-shibboleth-2.0-attribute-resolver-dc.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 113
-/java-shib-common/!svn/ver/1015/branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-resolver-dc.xsd
-END
-shibboleth-2.0-resource.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 99
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-resource.xsd
-END
-shibboleth-2.0-attribute-authority.xsd
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/java-shib-common/!svn/ver/979/branches/REL_1/src/main/resources/schema/shibboleth-2.0-attribute-authority.xsd
-END
diff --git a/src/main/resources/schema/.svn/entries b/src/main/resources/schema/.svn/entries
deleted file mode 100644
index 5c280fc..0000000
--- a/src/main/resources/schema/.svn/entries
+++ /dev/null
@@ -1,674 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/main/resources/schema
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-12-18T01:03:02.768787Z
-1088
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-shibboleth-2.0-security-policy-saml.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.226846Z
-57f3db4efe3249a9255e3e982ea7edec
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6636
-

-shibboleth-2.0-relying-party-saml.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.226846Z
-8b211042fab756de545f932c41e32ffc
-2013-12-18T01:03:02.768787Z
-1088
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-16604
-

-shibboleth-2.0-afp-mf-saml.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.230846Z
-2988df6ebeb642d69c67edad7fc515c7
-2013-03-20T00:06:55.515551Z
-1063
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9098
-

-shibboleth-2.0-attribute-resolver.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.230846Z
-95583dcfd0654db0c46723160682173b
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10661
-

-shibboleth-2.0-attribute-resolver-pc.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.230846Z
-55c2eecef04ac7fb0fdcfc4d55b81672
-2013-04-14T18:20:12.632879Z
-1073
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3597
-

-shibboleth-2.0-relying-party.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-35b413826199339148aaee4f28022d46
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6541
-

-shibboleth-2.0-afp.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-5b5cd7b29ffcb8e90ed0ce66fcf153bc
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9928
-

-shibboleth-2.0-security.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-c5e691589af530aa20d6669592f19d16
-2013-02-11T16:51:06.435201Z
-1053
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-33382
-

-shibboleth-2.0-profile-handler.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-41454a5303068bee6944fbbe62a3c0df
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6472
-

-shibboleth-2.0-attribute-map.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-0f341c4de47527ee8654701b51319467
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3019
-

-shibboleth-metadata-1.0.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-91bb6d7f4253a91c16a34d69b756941a
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1256
-

-shibboleth-2.0-metadata.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-1c15aa7bc65b4ff64c0eea1d91bd6320
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-20609
-

-shibboleth-2.0-attribute-encoder.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-46a15b51f785bd1d776835e9460be295
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9872
-

-shibboleth-2.0-services.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.222846Z
-b4619b81dabf2dab5055b7783dd05b72
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4525
-

-shibboleth-2.0-attribute-resolver-ad.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.226846Z
-864a495c0ae78fdf184660835047a6f0
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-15994
-

-shibboleth-2.0-afp-mf-basic.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.226846Z
-ac6e6122218ebcaf542b568dcf580500
-2012-03-23T01:03:49.462346Z
-1021
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14613
-

-shibboleth-2.0-attribute-resolver-dc.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.226846Z
-b107db12db9d4ed6caeca55e611f2326
-2012-02-23T15:10:40.444004Z
-1015
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-35038
-

-shibboleth-2.0-resource.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.226846Z
-8440215a5d35f1540e366a464a3ce911
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5148
-

-shibboleth-2.0-attribute-authority.xsd
-file
-
-
-
-
-2014-02-19T17:27:46.226846Z
-11909b6b885282cccd1502ff49279b87
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1985
-

diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp-mf-basic.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp-mf-basic.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp-mf-basic.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp-mf-saml.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp-mf-saml.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp-mf-saml.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-afp.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-authority.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-authority.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-authority.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-encoder.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-encoder.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-encoder.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-map.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-map.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-map.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-ad.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-ad.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-ad.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-dc.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-dc.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-dc.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-pc.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-pc.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver-pc.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-attribute-resolver.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-metadata.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-metadata.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-metadata.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-profile-handler.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-profile-handler.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-profile-handler.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-relying-party-saml.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-relying-party-saml.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-relying-party-saml.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-relying-party.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-relying-party.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-relying-party.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-resource.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-resource.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-resource.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-security-policy-saml.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-security-policy-saml.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-security-policy-saml.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-security.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-security.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-security.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-services.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-services.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-2.0-services.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/prop-base/shibboleth-metadata-1.0.xsd.svn-base b/src/main/resources/schema/.svn/prop-base/shibboleth-metadata-1.0.xsd.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/main/resources/schema/.svn/prop-base/shibboleth-metadata-1.0.xsd.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp-mf-basic.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp-mf-basic.xsd.svn-base
deleted file mode 100644
index 52e50f7..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp-mf-basic.xsd.svn-base
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:afp="urn:mace:shibboleth:2.0:afp" targetNamespace="urn:mace:shibboleth:2.0:afp:mf:basic" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:afp" schemaLocation="classpath:/schema/shibboleth-2.0-afp.xsd"/>
-
-    <!-- Blanket Match Function -->
-    <complexType name="ANY">
-        <annotation>
-            <documentation>A match function that evaluates to true.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType"/>
-        </complexContent>
-    </complexType>
-
-    <!--  Boolean Match Functions -->
-    <complexType name="AND">
-        <annotation>
-            <documentation>
-                A match function that performs a logical AND on the results of all contained matching functions.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <choice minOccurs="2" maxOccurs="unbounded">
-                    <element name="Rule" type="afp:MatchFunctorType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be ANDed.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="RuleReference" type="afp:ReferenceType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be ANDed.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="OR">
-        <annotation>
-            <documentation>
-                A match function that performs a logical OR on the results of all contained matching functions.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <choice minOccurs="2" maxOccurs="unbounded">
-                    <element name="Rule" type="afp:MatchFunctorType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be ORed.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="RuleReference" type="afp:ReferenceType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be ORed.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="NOT">
-        <annotation>
-            <documentation>
-                A match function that performs a logical NOT on the result of the contained matching function.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <choice>
-                    <element name="Rule" type="afp:MatchFunctorType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be negated.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="RuleReference" type="afp:ReferenceType">
-                        <annotation>
-                            <documentation>
-                                The set of match function rules to be negated.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <!--  Literal String Match Functions -->
-    <complexType name="AttributeRequesterString">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute request against the specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:StringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeIssuerString">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute issuer against the specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:StringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="PrincipalNameString">
-        <annotation>
-            <documentation>A match function that matches the principal name against the specified value.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:StringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AuthenticationMethodString">
-        <annotation>
-            <documentation>
-                A match function that matches the authentication method against the specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:StringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeValueString">
-        <annotation>
-            <documentation>
-                A match function that matches the value of an attribute against the specified value. This match
-                evaluates to true if the attribute contains the specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:AttributeTargetedStringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeScopeString">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute scope against the specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:AttributeTargetedStringMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeTargetedStringMatchType" abstract="true">
-        <complexContent>
-            <extension base="basic:StringMatchType">
-                <attribute name="attributeID" type="string">
-                    <annotation>
-                        <documentation>
-                            The ID of the attribute whose value should be matched. If no attribute ID is specified the
-                            ID of the containing attribute rule is assumed.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="StringMatchType" abstract="true">
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="value" type="string" use="required">
-                    <annotation>
-                        <documentation>The string value to match.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="ignoreCase" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether case should be ignored when evaluating the match.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <!--  Regular Expression Match Functions -->
-    <complexType name="AttributeRequesterRegex">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute requester against the specified regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:RegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeIssuerRegex">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute issuer against the specified regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:RegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="PrincipalNameRegex">
-        <annotation>
-            <documentation>
-                A match function that matches the principal name against the specified regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:RegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AuthenticationMethodRegex">
-        <annotation>
-            <documentation>
-                A match function that matches the authentication method against the specified regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:RegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeValueRegex">
-        <annotation>
-            <documentation>
-                A match function that matches an attribute value against the specified regular expression. This function
-                evaluates to true if any value matches the given expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:AttributeTargetedRegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeScopeRegex">
-        <annotation>
-            <documentation>
-                A match function that matches the attribute scope against the specified regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="basic:AttributeTargetedRegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeTargetedRegexMatchType" abstract="true">
-        <complexContent>
-            <extension base="basic:RegexMatchType">
-                <attribute name="attributeID" type="string">
-                    <annotation>
-                        <documentation>
-                            The ID of the attribute whose value should be matched. If no attribute ID is specified the
-                            ID of the containing attribute rule is assumed.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="RegexMatchType" abstract="true">
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="regex" type="string" use="required">
-                    <annotation>
-                        <documentation>The regular expression values are matched against.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <!-- Misc. Functions -->
-    <complexType name="Script">
-        <annotation>
-            <documentation>
-                A match function that evaluates a script to determine if some criteria is met. The script MUST return a
-                boolean.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <choice>
-                    <element name="Script" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>The script to evaluate to construct the attribute.</documentation>
-                        </annotation>
-                    </element>
-                    <element name="ScriptFile" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                The filesystem path to the script to evaluate to construct the attribute.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
-                <attribute name="language" type="string">
-                    <annotation>
-                        <documentation>
-                            The JSR-233 name for the scripting language that will be used. By default "javascript" is
-                            supported.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="NumberOfAttributeValues">
-        <annotation>
-            <documentation>
-                A match function that evaluates to true if the given attribute has as a number of values that falls
-                between the minimum and maximum. This method may be used as a sanity check to ensure that an unexpected
-                number of values did not come from the attribute resolver and be released.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="attributeID" type="string" use="required">
-                    <annotation>
-                        <documentation>The ID of the attribute whose value should be matched.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="minimum" type="nonNegativeInteger">
-                    <annotation>
-                        <documentation>Minimum number of values an attribute may have.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="maximum" type="positiveInteger">
-                    <annotation>
-                        <documentation>Maximum number of values an attribute may have.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp-mf-saml.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp-mf-saml.xsd.svn-base
deleted file mode 100644
index 2bc0877..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp-mf-saml.xsd.svn-base
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml" xmlns:afp="urn:mace:shibboleth:2.0:afp" targetNamespace="urn:mace:shibboleth:2.0:afp:mf:saml" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:afp" schemaLocation="classpath:/schema/shibboleth-2.0-afp.xsd"/>
-
-    <annotation>
-        <documentation>
-            A set of SAML specific match functions. These match functions only operate against a
-            SAMLFilterContext.
-        </documentation>
-    </annotation>
-
-    <complexType name="AttributeIssuerEntityAttributeExactMatch">
-        <annotation>
-            <documentation>
-                A match function that checks if the attribute issuer contains an entity attribute with the
-                specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityAttributeExactMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeRequesterEntityAttributeExactMatch">
-        <annotation>
-            <documentation>
-                A match function that checks if the attribute requester contains an entity attribute with the
-                specified value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityAttributeExactMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="EntityAttributeExactMatchType" abstract="true">
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="attributeName" type="string" use="required">
-                    <annotation>
-                        <documentation>The name of the entity attribute to match.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="attributeNameFormat" type="string" use="optional">
-                    <annotation>
-                        <documentation>The name format of the entity attribute to match.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="attributeValue" type="string" use="required">
-                    <annotation>
-                        <documentation>The value of the entity attribute to match.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeIssuerEntityAttributeRegexMatch">
-        <annotation>
-            <documentation>
-                A match function that checks if the attribute issuer contains an entity attribute with a
-                value that matches the given regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityAttributeRegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeRequesterEntityAttributeRegexMatch">
-        <annotation>
-            <documentation>
-                A match function that checks if the attribute requester contains an entity attribute with a
-                value that matches the given regular expression.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityAttributeRegexMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="EntityAttributeRegexMatchType" abstract="true">
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="attributeName" type="string" use="required">
-                    <annotation>
-                        <documentation>The name of the entity attribute to match.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="attributeNameFormat" type="string" use="optional">
-                    <annotation>
-                        <documentation>The name format of the entity attribute to match.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="attributeValueRegex" type="string" use="required">
-                    <annotation>
-                        <documentation>The regular expression that must match the value of the entity attribute to
-                            match.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeIssuerNameIDFormatExactMatch">
-        <annotation>
-            <documentation>
-                A match function that evaluates to true if the attribute issuer supports a specified
-                NameID format.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:NameIDFormatExactMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeRequesterNameIDFormatExactMatch">
-        <annotation>
-            <documentation>
-                A match function that evaluates to true if the attribute requester supports a specified
-                NameID format.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:NameIDFormatExactMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="NameIDFormatExactMatchType" abstract="true">
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="nameIdFormat" type="string" use="required">
-                    <annotation>
-                        <documentation>The NameID format that needs to be supported by the entity.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeRequesterInEntityGroup">
-        <annotation>
-            <documentation>
-                A match function that evaluates to true if the attribute requester is found in metadata and
-                is a member
-                of the given entity group.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityGroupMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeIssuerInEntityGroup">
-        <annotation>
-            <documentation>
-                A match function that evaluates to true if the attribute issuer is found in metadata and is a
-                member
-                of the given entity group.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="saml:EntityGroupMatchType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="EntityGroupMatchType" abstract="true">
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="groupID" type="string" use="required">
-                    <annotation>
-                        <documentation>The entity group ID that an entity must be in.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeScopeMatchesShibMDScope">
-        <annotation>
-            <documentation>
-                A match function that ensures that an attribute value's scope matches a scope given in
-                metadata for the entity or role.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeInMetadata">
-        <annotation>
-            <documentation>
-                A match function that evaluates to true if an attribute (or specific values) is specified by
-                the requesting entity's AttributeConsumingService SP metadata.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="afp:MatchFunctorType">
-                <attribute name="onlyIfRequired" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether attributes noted as optional should match.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="matchIfMetadataSilent" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether a match should occur if the metadata does
-                            not contain an AttributeConsumingService descriptor.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>    
-    
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp.xsd.svn-base
deleted file mode 100644
index 9fe3520..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-afp.xsd.svn-base
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:service="urn:mace:shibboleth:2.0:services" targetNamespace="urn:mace:shibboleth:2.0:afp" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:services" schemaLocation="classpath:/schema/shibboleth-2.0-services.xsd"/>
-
-    <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="classpath:/schema/xmldsig-core-schema.xsd"/>
-
-    <annotation>
-        <documentation>Schema for the attribute filter policies.</documentation>
-    </annotation>
-
-    <complexType name="ShibbolethAttributeFilteringEngine">
-        <annotation>
-            <documentation>Service definition for creating Shibboleth attribute filtering engines.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ReloadableServiceType"/>
-        </complexContent>
-    </complexType>
-
-    <element name="AttributeFilterPolicyGroup" type="afp:AttributeFilterPolicyGroupType">
-        <annotation>
-            <documentation>
-                Root element of the attribute filter policy. Represents a named group of filter policies.
-            </documentation>
-        </annotation>
-    </element>
-    <complexType name="AttributeFilterPolicyGroupType">
-        <complexContent>
-            <extension base="afp:IdentityType">
-                <sequence>
-                    <element ref="afp:PolicyRequirementRule" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Defines a set of applications requirements that may be reused across multiple filter
-                                policies.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="afp:PermitValueRule" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Defines a permit value rule that may be reused across multiple attribute rules.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="afp:DenyValueRule" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Defines a deny value rule that may be reused across multiple attribute rules.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="afp:AttributeRule" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Defines an attribute rule that may be reused across multiple filter policies.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="afp:AttributeFilterPolicy" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A policy that defines the set of attribute value filters that will be applied if its
-                                application requirements are met.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="ds:Signature" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                Digital signature for the policy. Policies that are fetched from an external source,
-                                such as a federation site, should be signed.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="AttributeFilterPolicy" type="afp:AttributeFilterPolicyType">
-        <annotation>
-            <documentation>
-                A policy that defines a set of attribute value filters rules that should be used if given requirements
-                are met.
-            </documentation>
-        </annotation>
-    </element>
-    <complexType name="AttributeFilterPolicyType">
-        <complexContent>
-            <extension base="afp:IdentityType">
-                <sequence>
-                    <choice>
-                        <element ref="afp:PolicyRequirementRule">
-                            <annotation>
-                                <documentation>
-                                    A requirement that if met signals that this filter policy should be used.
-                                </documentation>
-                            </annotation>
-                        </element>
-                        <element name="PolicyRequirementRuleReference" type="afp:ReferenceType">
-                            <annotation>
-                                <documentation>
-                                    Reference to a PolicyRequirement defined within this policy group or another.
-                                </documentation>
-                            </annotation>
-                        </element>
-                    </choice>
-                    <choice minOccurs="0" maxOccurs="unbounded">
-                        <element ref="afp:AttributeRule">
-                            <annotation>
-                                <documentation>
-                                    A rule that describes how values of an attribute will be filtered.
-                                </documentation>
-                            </annotation>
-                        </element>
-                        <element name="AttributeRuleReference" type="afp:ReferenceType">
-                            <annotation>
-                                <documentation>
-                                    Reference to a AttributeRule defined within this policy group or another.
-                                </documentation>
-                            </annotation>
-                        </element>
-                    </choice>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="AttributeRule" type="afp:AttributeRuleType">
-        <annotation>
-            <documentation>A rule that describes how values of an attribute will be filtered.</documentation>
-        </annotation>
-    </element>
-    <complexType name="AttributeRuleType">
-        <complexContent>
-            <extension base="afp:IdentityType">
-                <choice>
-                    <choice minOccurs="0">
-                        <element ref="afp:PermitValueRule"/>
-                        <element name="PermitValueRuleReference" type="afp:ReferenceType">
-                            <annotation>
-                                <documentation>
-                                    Reference to a PermitValueRule defined within this policy group or another.
-                                </documentation>
-                            </annotation>
-                        </element>
-                    </choice>
-                    <choice minOccurs="0">
-                        <element ref="afp:DenyValueRule"/>
-                        <element name="DenyValueRuleReference" type="afp:ReferenceType">
-                            <annotation>
-                                <documentation>
-                                    Reference to a DenyValueRule defined within this policy group or another.
-                                </documentation>
-                            </annotation>
-                        </element>
-                    </choice>
-                </choice>
-                <attribute name="attributeID" type="string" use="required">
-                    <annotation>
-                        <documentation>The ID of the attribute to which this rule applies.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="PolicyRequirementRule" type="afp:MatchFunctorType">
-        <annotation>
-            <documentation>A requirement that if met signals that a filter policy should be used.</documentation>
-        </annotation>
-    </element>
-    <element name="PermitValueRule" type="afp:MatchFunctorType">
-        <annotation>
-            <documentation>
-                A filter for attribute values. If the filter evaluates to true the value is permitted to be released.
-            </documentation>
-        </annotation>
-    </element>
-    <element name="DenyValueRule" type="afp:MatchFunctorType">
-        <annotation>
-            <documentation>
-                A filter for attribute values. If the filter evaluates to true the value is denied and may not be released.
-            </documentation>
-        </annotation>
-    </element>
-    <complexType name="MatchFunctorType" abstract="true">
-        <complexContent>
-            <extension base="afp:IdentityType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="IdentityType">
-        <attribute name="id" type="string">
-            <annotation>
-                <documentation>An ID, unique within the policy and component type.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <complexType name="ReferenceType">
-        <attribute name="ref" type="string">
-            <annotation>
-                <documentation>Used to reference a globally defined policy component.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-authority.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-authority.xsd.svn-base
deleted file mode 100644
index 5c0b1a1..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-authority.xsd.svn-base
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:authority="urn:mace:shibboleth:2.0:attribute:authority" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:service="urn:mace:shibboleth:2.0:services" targetNamespace="urn:mace:shibboleth:2.0:attribute:authority" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:services" schemaLocation="classpath:/schema/shibboleth-2.0-services.xsd"/>
-
-    <annotation>
-        <documentation>Shibboleth 2.0 Attribute Authority configuration schema</documentation>
-    </annotation>
-
-    <complexType name="SAML1AttributeAuthority">
-        <complexContent>
-            <extension base="authority:AttributeAuthorityType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2AttributeAuthority">
-        <complexContent>
-            <extension base="authority:AttributeAuthorityType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeAuthorityType" abstract="true">
-        <annotation>
-            <documentation>Service definition for the Shibboleth attribute authority.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ServiceType">
-                <attribute name="resolver" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The ID of the attribute resolver used by this authority.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="filter" type="string">
-                    <annotation>
-                        <documentation>
-                            The ID of the attribute filter used by this authority.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-encoder.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-encoder.xsd.svn-base
deleted file mode 100644
index e08a33a..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-encoder.xsd.svn-base
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:attribute:encoder" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="classpath:/schema/shibboleth-2.0-attribute-resolver.xsd"/>
-
-    <!-- Encoders that produce SAML 1 or SAML 2 Attribtues -->
-    <complexType name="SAML1String">
-        <annotation>
-            <documentation>Defines a SAML 1 string encoder for an attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="namespace" type="string">
-                    <annotation>
-                        <documentation>The SAML 1 Namespace of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML1Base64">
-        <annotation>
-            <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="namespace" type="string">
-                    <annotation>
-                        <documentation>The SAML 1 Namespace of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SAML1XMLObject">
-        <annotation>
-            <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="namespace" type="string">
-                    <annotation>
-                        <documentation>The SAML 1 Namespace of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2String">
-        <annotation>
-            <documentation>Defines a SAML 2 string encoder for an attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="nameFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 2 NameFormat of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="friendlyName" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2Base64">
-        <annotation>
-            <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="nameFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 2 NameFormat of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="friendlyName" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SAML2XMLObject">
-        <annotation>
-            <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="nameFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 2 NameFormat of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="friendlyName" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="BaseScopedAttributeEncoderType">
-        <annotation>
-            <documentation>Defines an encoder for a scoped attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="scopeType" type="encoder:ScopeType" use="optional">
-                    <annotation>
-                        <documentation>
-                            The type of scoping to use for the encoded attribute. Valid values are "inline" or
-                            "attribute".
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="scopeDelimiter" type="string" use="optional">
-                    <annotation>
-                        <documentation>
-                            If scopeType is "inline", this is the delimeter used between the attribute value and
-                            scope.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="scopeAttribute" type="string" use="optional">
-                    <annotation>
-                        <documentation>
-                            If scopeType is "attribute", this is the name of the name of the attribute used to carry the
-                            scope value.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML1ScopedString">
-        <annotation>
-            <documentation>Defines a SAML 1 string encoder for a scoped attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="encoder:BaseScopedAttributeEncoderType">
-                <attribute name="namespace" type="string">
-                    <annotation>
-                        <documentation>The SAML 1 Namespace of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2ScopedString">
-        <annotation>
-            <documentation>Defines a SAML 2 string encoder for a scoped attribute.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="encoder:BaseScopedAttributeEncoderType">
-                <attribute name="nameFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 2 NameFormat of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="friendlyName" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <simpleType name="ScopeType">
-        <restriction base="string">
-            <enumeration value="inline"/>
-            <enumeration value="attribute"/>
-        </restriction>
-    </simpleType>
-
-<!-- Encoders that produce SAML 1 or 2 name identifiers -->
-    <complexType name="SAML1StringNameIdentifier">
-        <annotation>
-            <documentation>Defines a SAML 1 string encoder for a NameIdentifier.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="nameFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 1 NameFormat of the NameIdentifier.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 1 NameQualfier of the NameIdentifier.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2StringNameID">
-        <annotation>
-            <documentation>Defines a SAML 2 string encoder for a NameID.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeEncoderType">
-                <attribute name="nameFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 2 NameFormat of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 NameQualfier of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-map.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-map.xsd.svn-base
deleted file mode 100644
index 97f27d0..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-map.xsd.svn-base
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:am="urn:mace:shibboleth:2.0:attribute-map" targetNamespace="urn:mace:shibboleth:2.0:attribute-map" elementFormDefault="qualified">
-
-    <annotation>
-        <documentation>
-            This schema maps SAML specific attribute names into shibboleth internal attribute IDs.
-        </documentation>
-    </annotation>
-
-    <element name="Attributes">
-        <annotation>
-            <documentation>The set of SAML 1/2 attribute mappings.</documentation>
-        </annotation>
-        <complexType>
-            <sequence>
-                <element name="Attribute" type="am:AttributeType" maxOccurs="unbounded"/>
-            </sequence>
-        </complexType>
-    </element>
-
-    <complexType name="AttributeType">
-        <annotation>
-            <documentation>Rule for mapping a SAML 1/2 attribute to an internal attribute ID.</documentation>
-        </annotation>
-        <sequence>
-            <element name="AttributeDecoder" type="am:AttributeDecoderType" minOccurs="0"/>
-        </sequence>
-        <attribute name="id" type="string" use="required">
-            <annotation>
-                <documentation>The internal attribute ID to which this SAML attribute maps.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="name" type="string" use="required">
-            <annotation>
-                <documentation>The name of the attribute.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="nameFormat" type="string">
-            <annotation>
-                <documentation>The SAML 1 Namespace or SAML 2 NameFormat of the attribute.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <complexType name="ScopedAttributeDecoder">
-        <annotation>
-            <documentation>Decoder for attributes with scoped values.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="am:AttributeDecoderType">
-                <attribute name="scopeDelimiter" type="string" use="optional">
-                    <annotation>
-                        <documentation>
-                            The character(s) used delimit the scoped information from the scope.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="StringAttributeDecoder">
-        <annotation>
-            <documentation>Decoder for attributes with string values.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="am:AttributeDecoderType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="AttributeDecoderType" abstract="true">
-        <annotation>
-            <documentation>Decodes a SAML attribute into its shibboleth-internal representation.</documentation>
-        </annotation>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-ad.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-ad.xsd.svn-base
deleted file mode 100644
index 4598d12..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-ad.xsd.svn-base
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:resolver:ad" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="classpath:/schema/shibboleth-2.0-attribute-resolver.xsd"/>
-
-    <complexType name="Simple">
-        <annotation>
-            <documentation>A basic attribute definition.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="PrincipalName">
-        <annotation>
-            <documentation>Exposes the principal's name as an attribute definition.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="PrincipalAuthenticationMethod">
-        <annotation>
-            <documentation>Exposes the principal's authentication method as an attribute definition.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="TransientId">
-        <annotation>
-            <documentation>A attribute definition used to construct transient subeject identifiers.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="storageServiceRef" type="string" default="shibboleth.StorageService">
-                    <annotation>
-                        <documentation>Storage service used to store created identifiers</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="lifetime" type="duration">
-                    <annotation>
-                        <documentation>Lifetime of issued identifiers</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="CryptoTransientId">
-        <annotation>
-            <documentation>An attribute definition used to construct stateless transient subject identifiers.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="dataSealerRef" type="string" use="required">
-                    <annotation>
-                        <documentation>Object used to protect and encrypt identifiers</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="lifetime" type="duration">
-                    <annotation>
-                        <documentation>Lifetime of issued identifiers</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Scoped">
-        <annotation>
-            <documentation>A basic attribute definition which supports attribute scoping.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="scope" type="string" use="required">
-                    <annotation>
-                        <documentation>Value to use for scoping the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="Prescoped">
-        <annotation>
-            <documentation>
-                An attribute definition that splits the values of the source attribute into an attribute value 
-                with a value and scope.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="scopeDelimiter" type="string">
-                    <annotation>
-                        <documentation>Delimiter between the value and scope.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="RegexSplit">
-        <annotation>
-            <documentation>An attribute definition that splits the source attribute's values based on a regular expression.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="regex" type="string" use="required">
-                    <annotation>
-                        <documentation>The regular expression used to split a value.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="caseSensitive" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating the case sensitivity of the regular expression.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML1NameIdentifier">
-        <annotation>
-            <documentation>An attribute definition that creates attributes whose values are SAML 1 NameIdentifiers.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="nameIdFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 1 NameFormat of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameIdQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 1 NameQualifier of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2NameID">
-        <annotation>
-            <documentation>An attribute definition that creates attributes whose values are SAML 2 NameIDs.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="nameIdFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 2 NameFormat of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameIdQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 NameQualifier of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameIdSPQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 SPNameQualifier of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Script">
-        <annotation>
-            <documentation>
-                An attribute definition that constructs its attributes by means of a script supported by JSR-223. The
-                script is provided all the edu.internet2.middleware.shibboleth.common.attribute.Attribute object
-                resolved from all the definitions dependencies. The resultant attribute definition must then be bound to
-                a script attribute corresponding to the script variable whose name is the ID of the definition. This
-                variable is injected into the script by the attribute definition.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <choice>
-                    <element name="Script" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>The script to evaluate to construct the attribute.</documentation>
-                        </annotation>
-                    </element>
-                    <element name="ScriptFile" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                The filesystem path to the script to evaluate to construct the attribute.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
-                <attribute name="language" type="string">
-                    <annotation>
-                        <documentation>
-                            The JSR-233 name for the scripting language that will be used. By default "javascript" is
-                            supported.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Mapped">
-        <annotation>
-            <documentation>
-                The mapped attribute definition performs a many to many mapping from source attributes values provided
-                by the definition's dependencies to values which are returned. Each source value is passed through each
-                defined ValueMap which may result in one or more resulting values. If no ValueMaps match the source
-                value and a DefaultValue is defined, the DefaultValue is used.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <sequence>
-                    <element name="DefaultValue" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                A source value is mapped to the DefaultValue if none of the ValueMaps result in a match.
-                                This string may not contain regular expression back references.
-                            </documentation>
-                        </annotation>
-                        <complexType>
-                            <simpleContent>
-                                <extension base="string">
-                                    <attribute name="passThru" type="boolean">
-                                        <annotation>
-                                            <documentation>
-                                                If true, the source value is passed thru unmodified. If passThru is
-                                                enabled, DefaultValue may not contain a string value.
-                                            </documentation>
-                                        </annotation>
-                                    </attribute>
-                                </extension>
-                            </simpleContent>
-                        </complexType>
-                    </element>
-                    <element name="ValueMap" type="ad:ValueMapType" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="ValueMapType">
-        <annotation>
-            <documentation>
-                Performs many to one mapping of source values to a return value. SourceValue strings may include regular
-                expressions and the ReturnValue may include back references to capturing groups as supported by
-                java.util.regex.Pattern.
-            </documentation>
-        </annotation>
-        <sequence>
-            <element name="ReturnValue" type="string">
-                <annotation>
-                    <documentation>The value to be returned from this value map.</documentation>
-                </annotation>
-            </element>
-            <element name="SourceValue" maxOccurs="unbounded">
-                <annotation>
-                    <documentation>A regular expression string to be matched against the incoming value.</documentation>
-                </annotation>
-                <complexType>
-                    <simpleContent>
-                        <extension base="string">
-                            <attribute name="ignoreCase" type="boolean">
-                                <annotation>
-                                    <documentation>If true, value matching will be case-insensitive.</documentation>
-                                </annotation>
-                            </attribute>
-                            <attribute name="partialMatch" type="boolean">
-                                <annotation>
-                                    <documentation>
-                                        If true, the SourceValue may match only a substring of the incoming value. By
-                                        default, it must match the entire value.
-                                    </documentation>
-                                </annotation>
-                            </attribute>
-                        </extension>
-                    </simpleContent>
-                </complexType>
-            </element>
-        </sequence>
-    </complexType>
-
-    <complexType name="Template">
-        <annotation>
-            <documentation>
-                An Attribute Definition that constructs its values based on the values of its dependencies using the
-                Velocity Template Language. Dependencies may have multiple values, however multiple dependencies must
-                have the same number of values. In the case of multi-valued dependencies, the template will be evaluated
-                multiples times, iterating over each dependency.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <sequence>
-                    <element name="Template" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                Template specified in the Velocity Template Language used to construct attribute values.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="SourceAttribute" type="string" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Attribute IDs which should be used in this definition, rather than the sourceAttributeID
-                                attribute. Each source attribute is available to be used in the Template as
-                                ${attribute_name}. If the source attribute has multiple values, only one value is
-                                available to the template at a time, but the template will be evaluated once for each
-                                value.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="velocityEngine" type="string" fixed="shibboleth.VelocityEngine">
-                    <annotation>
-                        <documentation>Name of the velocity engine defined within the application.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-dc.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-dc.xsd.svn-base
deleted file mode 100644
index 18dc1d9..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-dc.xsd.svn-base
+++ /dev/null
@@ -1,739 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:sec="urn:mace:shibboleth:2.0:security" targetNamespace="urn:mace:shibboleth:2.0:resolver:dc" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="classpath:/schema/shibboleth-2.0-attribute-resolver.xsd"/>
-        
-    <import namespace="urn:mace:shibboleth:2.0:security" schemaLocation="classpath:/schema/shibboleth-2.0-security.xsd"/>
-
-    <complexType name="Static">
-        <annotation>
-            <documentation>
-                A data connector that gets its information from a static list of attributes and values specified within
-                this configuration.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseDataConnectorType">
-                <sequence>
-                    <element name="Attribute" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Specifies an attribute, and its values, to be exposed by this connector.
-                            </documentation>
-                        </annotation>
-                        <complexType>
-                            <sequence>
-                                <element name="Value" type="string" maxOccurs="unbounded">
-                                    <annotation>
-                                        <documentation>
-                                            A value of the attribute. If the value contains characters that would
-                                            otherwise need to be XML encoded you may wrap the value in a CDATA section.
-                                        </documentation>
-                                    </annotation>
-                                </element>
-                            </sequence>
-                            <attribute name="id" type="string" use="required">
-                                <annotation>
-                                    <documentation>The ID of the attribute.</documentation>
-                                </annotation>
-                            </attribute>
-                        </complexType>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="ComputedId">
-        <annotation>
-            <documentation>
-                An ID created by taking the SHA-1 hash of the requesting entity's ID, an attribute value (usually a user identifier), and a salt.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseDataConnectorType">
-                <attribute name="generatedAttributeID" type="string">
-                    <annotation>
-                        <documentation>
-                            The name of the attribute which should be used to as input to the computed ID.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="sourceAttributeID" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The name of the attribute which should be used to as input to the computed ID.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="salt" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            A salt, of at least 16 bytes, used in the computed ID.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="StoredId">
-        <annotation>
-            <documentation>
-                A connector that either generates a persistent ID by hashing or by looking it up in a database.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseDataConnectorType">
-                <choice>
-                    <element ref="dc:ContainerManagedConnection">
-                        <annotation>
-                            <documentation>
-                                A connection, or pool of connections, to the database managed by the application
-                                container.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="dc:ApplicationManagedConnection">
-                        <annotation>
-                            <documentation>
-                                A connection, or pool of connections, to the database managed by the data connector.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>    
-                <attribute name="queryTimeout" type="string">
-                    <annotation>
-                        <documentation>
-                            Timeout for the queries made to the database.
-                            Timeout is given in ISO8601 duration form.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="generatedAttributeID" type="string">
-                    <annotation>
-                        <documentation>
-                            The name of the attribute which should be used to as input to the computed ID.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="sourceAttributeID" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The name of the attribute which should be used to as input to the computed ID.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="salt" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            A salt, of at least 16 bytes, used in the computed ID.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="RelationalDatabase">
-        <annotation>
-            <documentation>
-                A database connector definition that uses JDBC version 3 to connect to and pull information from a
-                relational database.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseDataConnectorType">
-                <sequence>
-                    <choice>
-                        <element ref="dc:ContainerManagedConnection">
-                            <annotation>
-                                <documentation>
-                                    A connection, or pool of connections, to the database managed by the application
-                                    container.
-                                </documentation>
-                            </annotation>
-                        </element>
-                        <element ref="dc:ApplicationManagedConnection">
-                            <annotation>
-                                <documentation>
-                                    A connection, or pool of connections, to the database managed by the data connector.
-                                </documentation>
-                            </annotation>
-                        </element>
-                    </choice>
-                    <element name="QueryTemplate" type="string">
-                        <annotation>
-                            <documentation>
-                                A template that will be used to create the SQL query thats pulls information from the
-                                database.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="Column" type="dc:ColumnType" minOccurs="0" maxOccurs="unbounded"/>
-                    <element name="ResultCache" type="dc:CacheConfigType" minOccurs="0"/>
-                </sequence>
-                <attribute name="readOnlyConnection" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag that determines whether the connection to the database is read-only, if the
-                            value is true, or read-write if the value is false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="queryUsesStoredProcedure" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag that determines whether stored procedures might be used in the SQL queries
-                            used in this connector.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="queryTimeout" type="string">
-                    <annotation>
-                        <documentation>
-                            Timeout for the queries made to the database.
-                            Timeout is given in ISO8601 duration form.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="noResultIsError" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether a query returning no results should be considered an error. If
-                            an error is raised and a failover dependency is defined for this connector the failover will
-                            be invoked.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="cacheResults" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag that determines whether to cache results. Results using a compound key
-                            consisting of the principal name for whom the information is being requested and the actual
-                            SQL query used.
-                            
-                            This option is deprecated.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="templateEngine" type="string" fixed="shibboleth.TemplateEngine">
-                    <annotation>
-                        <documentation>
-                            Name of the template engine defined within the application.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="ContainerManagedConnection" type="dc:ContainerManagedConnectionType">
-        <annotation>
-            <documentation>
-                Describes a database connection source that is managed by the application container.
-            </documentation>
-        </annotation>
-    </element>
-    <complexType name="ContainerManagedConnectionType">
-        <sequence>
-            <element name="JNDIConnectionProperty" type="dc:PropertyType" minOccurs="0" maxOccurs="unbounded">
-                <annotation>
-                    <documentation>
-                        A property used when constructing a JNDI initial context which in turn is used to lookup the
-                        database DataSource.
-                    </documentation>
-                </annotation>
-            </element>
-        </sequence>
-        <attribute name="resourceName" type="string" use="required">
-            <annotation>
-                <documentation>The resource name the DataSource is bound to in the JNDI tree.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <element name="ApplicationManagedConnection" type="dc:ApplicationManagedConnectionType">
-        <annotation>
-            <documentation>
-                Describes a database connection source that is managed by the attribute resolver data connector.
-            </documentation>
-        </annotation>
-    </element>
-    <complexType name="ApplicationManagedConnectionType">
-        <attribute name="jdbcDriver" type="string" use="required">
-            <annotation>
-                <documentation>
-                    This is the full qualified class name of the JDBC driver used to connect to the database.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="jdbcURL" type="string" use="required">
-            <annotation>
-                <documentation>
-                    The JDBC URL for the database. These are usually of the form
-                    jdbc:databaseProduceName:databaseSpecificInformation. For example, jdbc:hsql:mem:MyDatabase
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="jdbcUserName" type="string">
-            <annotation>
-                <documentation>The user name to use while connecting to the database.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="jdbcPassword" type="string">
-            <annotation>
-                <documentation>The password to use while connecting to the database.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolAcquireIncrement" type="positiveInteger">
-            <annotation>
-                <documentation>
-                    The number of new connections that will be created when the pool is exhausted.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolAcquireRetryAttempts" type="positiveInteger">
-            <annotation>
-                <documentation>
-                    The number of times the pool will try to establish a connection to a database.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolAcquireRetryDelay" type="positiveInteger">
-            <annotation>
-                <documentation>
-                    The amount of time, in milliseconds, the pool will wait before trying to retrieve a new connection
-                    after it has failed.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolBreakAfterAcquireFailure" type="boolean">
-            <annotation>
-                <documentation>
-                    A boolean flag that indicates whether the pool should be marked as permanently unavailable if a new
-                    connection can not be established after the acquire retry attempts is reached.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolMinSize" type="nonNegativeInteger">
-            <annotation>
-                <documentation>
-                    The minimum number of connections the pool will establish with the database. A value of zero means
-                    there is no minimum.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolMaxSize" type="nonNegativeInteger">
-            <annotation>
-                <documentation>
-                    The maximum number of connections the pool will establish with the database. A value of zero means
-                    there is no maximum.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolMaxIdleTime" type="positiveInteger">
-            <annotation>
-                <documentation>
-                    The maximum time, in seconds, that an established connection will remain idle before it is closed.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="poolIdleTestPeriod" type="positiveInteger">
-            <annotation>
-                <documentation>
-                    The interval, in seconds, that the pool will scan idle established connections, using the validation
-                    query, for liveness.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <complexType name="PropertyType">
-        <attribute name="name" type="string" use="required">
-            <annotation>
-                <documentation>The name of the property.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="value" type="string" use="required">
-            <annotation>
-                <documentation>The value of the property,</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <complexType name="ColumnType">
-        <attribute name="columnName" type="string" use="required">
-            <annotation>
-                <documentation>The name of the database column.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="attributeID" type="string">
-            <annotation>
-                <documentation>The name of the attribute that data from this column should be added to.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="type" type="dc:ColumnDataType">
-            <annotation>
-                <documentation>The Java data type data in the column should be extracted as.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <simpleType name="ColumnDataType">
-        <restriction base="string">
-            <enumeration value="BigDecimal"/>
-            <enumeration value="Boolean"/>
-            <enumeration value="Byte"/>
-            <enumeration value="ByteArray"/>
-            <enumeration value="Date"/>
-            <enumeration value="Double"/>
-            <enumeration value="Float"/>
-            <enumeration value="Integer"/>
-            <enumeration value="Long"/>
-            <enumeration value="Object"/>
-            <enumeration value="Short"/>
-            <enumeration value="String"/>
-            <enumeration value="Time"/>
-            <enumeration value="Timestamp"/>
-            <enumeration value="URL"/>
-        </restriction>
-    </simpleType>
-    
-    <complexType name="LDAPDirectory">
-        <annotation>
-            <documentation>
-                A data connector that can pull information from an LDAP, version 3, directory.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseDataConnectorType">
-                <sequence>
-                    <element name="FilterTemplate" type="string">
-                        <annotation>
-                            <documentation>
-                                A template used to construct the LDAP filter used to query the directory.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="ReturnAttributes" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                A space separated list of attributes that should be returned from the query.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="LDAPProperty" type="dc:PropertyType" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                LDAP connection properties relevant to the underlying provider being used.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="StartTLSTrustCredential" type="sec:X509Credential" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                The X.509 trust information to use when connecting to the directory over LDAPS or startTLS.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="StartTLSAuthenticationCredential" type="sec:X509Credential" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                The X.509 client authentication information to use when connecting to the directory over LDAPS or startTLS.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="ConnectionPool" type="dc:LdapPoolConfigType" minOccurs="0"/>
-                    <element name="ResultCache" type="dc:CacheConfigType" minOccurs="0"/>
-                </sequence>
-                <attribute name="ldapURL" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                        The URL to the LDAP server.
-                        If the search scope is set to ONELEVEL only the entries 
-                        within this node will be searched, if SUBTREE is specified entries within this node and descendant 
-                        nodes will be searched.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="connectionStrategy" type="dc:ConnectionStrategyType">
-                    <annotation>
-                        <documentation>
-                            The LDAP connection strategy. Acceptable values are DEFAULT, ACTIVE_PASSIVE, ROUND_ROBIN, and RANDOM.
-                            Default value is ACTIVE_PASSIVE.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="baseDN" type="string">
-                    <annotation>
-                        <documentation>
-                            The base DN from which attribute search filtering occurs
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="principal" type="string">
-                    <annotation>
-                        <documentation>The DN for the principal connecting to the LDAP directory.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="principalCredential" type="string">
-                    <annotation>
-                        <documentation>
-                            The credential for the principal connecting to the LDAP directory.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="authenticationType" type="dc:AuthenticationType">
-                    <annotation>
-                        <documentation>
-                            The LDAP authentication type. Acceptable values are ANONYMOUS, SIMPLE, STRONG, EXTERNAL, DIGEST_MD5, CRAM_MD5, GSSAPI.
-                            Default value is SIMPLE.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="searchScope" type="dc:SearchScopeType">
-                    <annotation>
-                        <documentation>
-                            The LDAP search scope. Acceptable values are OBJECT, ONELEVEL, SUBTREE.
-                            Default value is SUBTREE.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="useStartTLS" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether startTLS should be used when connecting to the LDAP.
-                            Default value is false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="poolInitialSize" type="nonNegativeInteger">
-                    <annotation>
-                        <documentation>
-                            This attribute is deprecated, use LdapPoolConfig#minPoolSize instead.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="poolMaxIdleSize" type="nonNegativeInteger">
-                    <annotation>
-                        <documentation>
-                            This attribute is deprecated, use LdapPoolConfig#maxPoolSize instead.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="searchTimeLimit" type="string">
-                    <annotation>
-                        <documentation>
-                            The maximum amount of time to wait for search results. If this limit is
-                            reached a timeout error is raised. Default value is 3 seconds.
-                            Time is expressed in ISO8601 duration format.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="maxResultSize" type="positiveInteger">
-                    <annotation>
-                        <documentation>
-                            The maximum number of results that may be returned from a query.
-                            Default value is 1.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="cacheResults" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating that search results should be cached for the duration of a user's
-                            session.
-                            Default value is false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="mergeResults" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating that if multiple results are returned they should be merged into
-                            a single result that contains the combined attributes and values of all the results. If more
-                            than one result is returned and this is set to false the first result is used.
-                            Default value is false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="noResultIsError" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether a query returning no results should be considered an error. If
-                            an error is raised and a failover dependency is defined for this connector the failover will
-                            be invoked.
-                            Default value is false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="lowercaseAttributeNames" type="boolean">
-                    <annotation>
-                        <documentation>
-                            Whether to lowercase LDAP attribute names used as IDs for shibboleth attributes
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="templateEngine" type="string" fixed="shibboleth.TemplateEngine">
-                    <annotation>
-                        <documentation>Name of the template engine defined within the application.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <simpleType name="ConnectionStrategyType">
-        <annotation>
-            <documentation>Supported connection strategies.</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="DEFAULT"/>
-            <enumeration value="ACTIVE_PASSIVE"/>
-            <enumeration value="ROUND_ROBIN"/>
-            <enumeration value="RANDOM"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="AuthenticationType">
-        <annotation>
-            <documentation>Supported authentication types.</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="ANONYMOUS"/>
-            <enumeration value="SIMPLE"/>
-            <enumeration value="STRONG"/>
-            <enumeration value="EXTERNAL"/>
-            <enumeration value="DIGEST_MD5"/>
-            <enumeration value="CRAM_MD5"/>
-            <enumeration value="GSSAPI"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="SearchScopeType">
-        <annotation>
-            <documentation>Supported search scopes.</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="SUBTREE"/>
-            <enumeration value="ONELEVEL"/>
-            <enumeration value="OBJECT"/>
-        </restriction>
-    </simpleType>
-
-    <complexType name="LdapPoolConfigType">
-        <attribute name="minPoolSize" type="nonNegativeInteger">
-            <annotation>
-                <documentation>
-                    The minimum number of ldap connections that should always be available in the pool.
-                    Note that these connections are provisioned as soon as the pool is initialized.
-                    Default value is 0.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="maxPoolSize" type="nonNegativeInteger">
-            <annotation>
-                <documentation>
-                    The maximum number of ldap connections that should ever be available in the pool.
-                    Note that when this threshold is reach the pool will begin blocking until a connection
-                    is available.
-                    Default value is 3.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="blockWhenEmpty" type="boolean">
-            <annotation>
-                <documentation>
-                    Whether the pool should block when maxPoolSize objects are in use.
-                    If false, pool will grow beyond the maxPoolSize value.
-                    Note that a properly configured blocking pool will yield better performance. 
-                    Default value is true.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="blockWaitTime" type="string">
-            <annotation>
-                <documentation>
-                    Amount of time to block while waiting for a connection from the pool.  If no
-                    wait time is given, callers will block indefinitely.
-                    
-                    Values are expressed in ISO8601 duration format.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="validatePeriodically" type="boolean">
-            <annotation>
-                <documentation>
-                    Whether each ldap connection should be checked on a periodic basis.
-                    Default value is false.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="validateTimerPeriod" type="string">
-            <annotation>
-                <documentation>
-                    Time that the periodic pool validation process should repeat.
-                    Ldap objects are pruned when they have been idle beyond the expiration time.
-                    The pool is not pruned below the minimum pool size.
-                    Default value is 30 minutes.
-                    
-                    Period is expressed in ISO8601 duration format.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="validateDN" type="string">
-            <annotation>
-                <documentation>
-                    Ldap compare DN to use for connection validation.
-                    Used in conjunction with validateFilter to perform a compare.
-                    Default value is empty.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="validateFilter" type="string">
-            <annotation>
-                <documentation>
-                    Ldap compare filter to use for connection validation.
-                    Used in conjuction with validateDN to perform a compare.
-                    Default value is (objectClass=*).
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="expirationTime" type="string">
-            <annotation>
-                <documentation>
-                    Time in that an object in the pool should be considered stale and ready for removal.
-                    Time is expressed in ISO8601 duration format.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <complexType name="CacheConfigType">
-        <attribute name="cacheManagerRef" type="string">
-        <annotation>
-                <documentation>
-                    Name of the CacheManager bean that will manage the result cache.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="elementTimeToLive" type="string">
-        <annotation>
-                <documentation>
-                    Length of time a result will be cached.
-
-                    Duration is expressed in ISO8601 duration notation.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="maximumCachedElements" type="string">
-        <annotation>
-                <documentation>
-                   Maximum number of results that will be held in cache.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-    
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-pc.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-pc.xsd.svn-base
deleted file mode 100644
index d885960..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver-pc.xsd.svn-base
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:resolver:pc" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="classpath:/schema/shibboleth-2.0-attribute-resolver.xsd"/>
-        
-    <import namespace="urn:mace:shibboleth:2.0:resolver:dc" schemaLocation="classpath:/schema/shibboleth-2.0-attribute-resolver-dc.xsd"/>
-
-    <complexType name="Transient">
-        <annotation>
-            <documentation>
-                A principal connector that returns the SAML name identifier value as the principal name.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BasePrincipalConnectorType">
-                <attribute name="storageServiceRef" type="string" default="shibboleth.StorageService">
-                    <annotation>
-                        <documentation>
-                            The identifier of the storage service used to store and retrieve principal names.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="CryptoTransient">
-        <annotation>
-            <documentation>
-                A principal connector that decrypts the SAML name identifier value as the principal name.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BasePrincipalConnectorType">
-                <attribute name="dataSealerRef" type="string" use="required">
-                    <annotation>
-                        <documentation>Object used to decrypt identifiers</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="StoredId">
-        <annotation>
-            <documentation>
-                A principal connector that returns the SAML name identifier value as the principal name.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BasePrincipalConnectorType">
-                <attribute name="storedIdDataConnectorRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The ID of the StoredId data connector that created the ID to be resolved.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="noResultIsError" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether a query returning no results should be considered an error. 
-                            Default value is false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Direct">
-        <annotation>
-            <documentation>
-                A principal connector that returns the SAML name identifier value as the principal name.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BasePrincipalConnectorType"/>
-        </complexContent>
-    </complexType>
-    
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver.xsd.svn-base
deleted file mode 100644
index 49e3537..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-attribute-resolver.xsd.svn-base
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:service="urn:mace:shibboleth:2.0:services" targetNamespace="urn:mace:shibboleth:2.0:resolver" elementFormDefault="qualified">
-
-    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="classpath:/schema/xml.xsd"/>
-
-    <import namespace="urn:mace:shibboleth:2.0:services" schemaLocation="classpath:/schema/shibboleth-2.0-services.xsd"/>
-
-    <annotation>
-        <documentation>Shibboleth 2.0 Attribute Resolver configuration schema</documentation>
-    </annotation>
-
-    <complexType name="ShibbolethAttributeResolver">
-        <annotation>
-            <documentation>Service definition for the Shibboleth attribute resolver.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ReloadableServiceType"/>
-        </complexContent>
-    </complexType>
-
-    <element name="AttributeResolver" type="resolver:AttributeResolverType">
-        <annotation>
-            <documentation>Root of the attribute resolver configuration file.</documentation>
-        </annotation>
-        <keyref name="AttributeDefinitionAttributeDefinitionDependencyRef" refer="resolver:PluginDependencyKey">
-            <selector xpath="./resolver:AttributeDefinition/resolver:Dependency"/>
-            <field xpath="@ref"/>
-        </keyref>
-        <keyref name="DataConnectorAttributeDefinitionDependencyRef" refer="resolver:PluginDependencyKey">
-            <selector xpath="./resolver:DataConnector/resolver:Dependency"/>
-            <field xpath="@ref"/>
-        </keyref>
-        <keyref name="PrincipalConnectorAttributeDefinitionDependencyRef" refer="resolver:PluginDependencyKey">
-            <selector xpath="./resolver:PrincipalConnector/resolver:Dependency"/>
-            <field xpath="@ref"/>
-        </keyref>
-        <key name="PluginDependencyKey">
-            <selector xpath="./resolver:AttributeDefinition|./resolver:DataConnector"/>
-            <field xpath="@id"/>
-        </key>
-    </element>
-    <complexType name="AttributeResolverType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="resolver:AttributeDefinition"/>
-            <element ref="resolver:DataConnector"/>
-            <element ref="resolver:PrincipalConnector"/>
-        </choice>
-    </complexType>
-
-    <element name="AttributeDefinition" type="resolver:BaseAttributeDefinitionType">
-        <annotation>
-            <documentation>Defines an attribute definition within this resolver.</documentation>
-        </annotation>
-    </element>
-    <complexType name="BaseAttributeDefinitionType">
-        <annotation>
-            <documentation>
-                Attribute definition define the finished attributes to be released by the resolver.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseResolutionPlugInType">
-                <sequence>
-                    <element name="DisplayName" type="resolver:LocalizedStringType" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A human readable name of for this attribute. This name may, for example, be displayed
-                                to the user with an attribute release approval request.
-                                
-                                If multiple display names are used they should bear an xml:lang attribute to 
-                                distinguish them.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="DisplayDescription" type="resolver:LocalizedStringType" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A human readable description of for this attribute. This name may, for example, be 
-                                displayed to the user with an attribute release approval request.
-                                
-                                If multiple display descriptions are used they should bear an xml:lang attribute to 
-                                distinguish them.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="resolver:AttributeEncoder" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="dependencyOnly" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag that indicates whether this attribute definition is only defined becaue its
-                            data is needed elsewhere within the resolver and as such should not be released outside the
-                            resolver.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="sourceAttributeID" type="string">
-                    <annotation>
-                        <documentation>
-                            The name of the attribute from the data connector which should be used to populate this
-                            attribute definition. For example, an attribute definition for "eduPersonPrincipalName" may
-                            have a source attribute of "uid" along with an appropriate scope value. This is an optional
-                            attribute, and if left empty the ID of the attribute definition will be used for the source
-                            attribute.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="AttributeEncoder" type="resolver:BaseAttributeEncoderType">
-        <annotation>
-            <documentation>Defines an encoder for an attribute.</documentation>
-        </annotation>
-    </element>
-    <complexType name="BaseAttributeEncoderType">
-        <annotation>
-            <documentation>
-                An attribute encoder is responsible for converting an attribute, and it's values, into a protocol
-                specific representation such as a SAML 1 Attribute or a SAML 2 NameID.
-            </documentation>
-        </annotation>
-        <attribute name="name" type="string"/>
-    </complexType>
-
-    <element name="DataConnector" type="resolver:BaseDataConnectorType">
-        <annotation>
-            <documentation>
-                Defines a data connector which is used to pull information from local infrastructure.
-            </documentation>
-        </annotation>
-    </element>
-    <complexType name="BaseDataConnectorType">
-        <annotation>
-            <documentation>
-                Data connectors pull information from local infrastructure, such as databases and LDAP directories, and
-                make these raw attributes available to attribute definitions for finishing.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseResolutionPlugInType">
-                <sequence>
-                    <element ref="resolver:FailoverDataConnector" minOccurs="0"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <element name="PrincipalConnector" type="resolver:BasePrincipalConnectorType">
-        <annotation>
-            <documentation>
-                Principal connectors convert a subject's NameID into an internal principal name for use within attribute
-                definitions and data connectors.
-            </documentation>
-        </annotation>
-    </element>
-    <complexType name="BasePrincipalConnectorType">
-        <annotation>
-            <documentation>
-                Principal connectors convert a subject's NameID into an internal principal name for use within attribute
-                definitions and data connectors.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseResolutionPlugInType">
-                <sequence>
-                    <element name="RelyingParty" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>The relying party for which this connector is valid.</documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="nameIDFormat" type="anyURI" use="required">
-                    <annotation>
-                        <documentation>The format of the NameID for which this connector is valid.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="BaseResolutionPlugInType" abstract="true">
-        <annotation>
-            <documentation>
-                A base type for all attribute resolver plugins: data and principal connectors and attribute definitions
-            </documentation>
-        </annotation>
-        <sequence>
-            <element ref="resolver:Dependency" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="id" type="string" use="required">
-            <annotation>
-                <documentation>A unique identifier for this definition.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <element name="Dependency" type="resolver:PluginDependencyType">
-        <annotation>
-            <documentation>Defines a dependency on a specific resolution plug-in.</documentation>
-        </annotation>
-    </element>
-    <element name="FailoverDataConnector" type="resolver:PluginDependencyType">
-        <annotation>
-            <documentation>Defines a data connector to use should the parent data connector fail.</documentation>
-        </annotation>
-    </element>
-    <complexType name="PluginDependencyType">
-        <annotation>
-            <documentation>A type that represents a reference to another plugin</documentation>
-        </annotation>
-        <attribute name="ref" type="string" use="required"/>
-    </complexType>
-
-    <complexType name="LocalizedStringType">
-        <simpleContent>
-            <extension base="string">
-                <attribute ref="xml:lang"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-metadata.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-metadata.xsd.svn-base
deleted file mode 100644
index 031bca3..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-metadata.xsd.svn-base
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:res="urn:mace:shibboleth:2.0:resource" xmlns:saml2md="urn:oasis:names:tc:SAML:2.0:metadata" targetNamespace="urn:mace:shibboleth:2.0:metadata" elementFormDefault="qualified">
-
-    <annotation>
-        <documentation>Schema describing metadata providers and filters.</documentation>
-    </annotation>
-
-    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="classpath:/schema/saml-schema-metadata-2.0.xsd"/>
-    <import namespace="urn:mace:shibboleth:2.0:resource" schemaLocation="classpath:/schema/shibboleth-2.0-resource.xsd"/>
-
-    <element name="MetadataProvider" type="shibmd:MetadataProviderType">
-        <annotation>
-            <documentation>Defines a provider of SAML 2 metadata information.</documentation>
-        </annotation>
-    </element>
-    <complexType name="ChainingMetadataProvider">
-        <annotation>
-            <documentation>
-                A metadata provider that composes other metadata providers. During a lookup operation member
-                providers
-                are searched in the order they listed in this providers configuration until one provides a
-                response to
-                the lookup. That response is then returned, no subsequent member providers are inspected.
-                Note, that
-                metadata filters and the require valid metadata flag expressed on this configuration overrides
-                those
-                settings on member providers.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataProviderType">
-                <sequence>
-                    <element ref="shibmd:MetadataProvider" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A member metadata provider that will be searched for information.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="ResourceBackedMetadataProvider">
-        <annotation>
-            <documentation>A metadata provider that reads metadata from a Resource.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:ReloadingMetadataProviderType">
-                <sequence>
-                    <element name="MetadataResource" type="res:ResourceType">
-                        <annotation>
-                            <documentation>The resource from which metadata will be read.</documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="maxCacheDuration" type="string">
-                    <annotation>
-                        <documentation>This property is deprecated, use requireValidMetadata instead.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="InlineMetadataProvider">
-        <annotation>
-            <documentation>A metadata provider that allows SAML 2 metadata to be specified inline.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataProviderType">
-                <choice>
-                    <element ref="saml2md:EntitiesDescriptor">
-                        <annotation>
-                            <documentation>A SAML 2 metadata EntitiesDescriptor declaration.</documentation>
-                        </annotation>
-                    </element>
-                    <element ref="saml2md:EntityDescriptor">
-                        <annotation>
-                            <documentation>A SAML 2 metadata EntitiesDescriptor declaration.</documentation>
-                        </annotation>
-                    </element>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="FileBackedHTTPMetadataProvider">
-        <annotation>
-            <documentation>
-                A metadata provider that periodically pulls metadata from a given URL. If the metadata is
-                valid it is
-                stored to disk. If the the provided URL can not be reached or the metadata retrieved is
-                invalid this
-                provider will fall back to its on-disk copy.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:HTTPMetadataProvider">
-                <attribute name="backingFile" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The path to the temporary file used to store valid metadata on-disk.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="HTTPMetadataProvider">
-        <annotation>
-            <documentation>A metadata provider that periodically pulls metadata from a given URL.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:ReloadingMetadataProviderType">
-                <attribute name="metadataURL" type="anyURI" use="required">
-                    <annotation>
-                        <documentation>The URL from which to retrieve the metadata.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="disregardSslCertificate" type="boolean">
-                    <annotation>
-                        <documentation>Server certificate will be ignored when fetching from an HTTPS source.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="maintainExpiredMetadata" type="boolean">
-                    <annotation>
-                        <documentation>This is deprecated, use requireValidMetadata instead.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="cacheDuration" type="string">
-                    <annotation>
-                        <documentation> This is deprecated, use maxRefreshDelay instead.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="requestTimeout" type="string">
-                    <annotation>
-                        <documentation>
-                            The maximum length of time to wait for the remote server to response.
-
-                            Timeout is expressed in ISO8601 duration notation.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="proxyHost" type="string">
-                    <annotation>
-                        <documentation>Hostname of the HTTP proxy through which connections will be made.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="proxyPort" type="positiveInteger">
-                    <annotation>
-                        <documentation>Port of the HTTP proxy through which connections will be made.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="proxyUser" type="string">
-                    <annotation>
-                        <documentation>User name used with the HTTP proxy through which connections will be made.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="proxyPassword" type="string">
-                    <annotation>
-                        <documentation>Password used with the HTTP proxy through which connections will be made.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="basicAuthUser" type="string">
-                    <annotation>
-                        <documentation>
-                            The user name to provide, during basic authentication, when connecting to the
-                            remote server.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="basicAuthPassword" type="string">
-                    <annotation>
-                        <documentation>
-                            The password to provide, during basic authentication, when connecting to the
-                            remote server.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <!-- Need to deal with socket factory -->
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="FilesystemMetadataProvider">
-        <annotation>
-            <documentation>A metatadata provider that reads SAML2 metadata from the filesystem.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:ReloadingMetadataProviderType">
-                <attribute name="metadataFile" type="string" use="required">
-                    <annotation>
-                        <documentation>The path to the metadata file.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="maintainExpiredMetadata" type="boolean">
-                    <annotation>
-                        <documentation>This is deprecated, use requireValidMetadata instead.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="ReloadingMetadataProviderType" abstract="true">
-        <annotation>
-            <documentation>A metadata provider that periodically reloads a cached metadata document.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataProviderType">
-                <attribute name="parserPoolRef" type="string">
-                    <annotation>
-                        <documentation>ID of the parser pool used to parse incoming metadata.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="taskTimerRef" type="string">
-                    <annotation>
-                        <documentation>ID of the task timer used to schedule background refresh jobs.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="refreshDelayFactor" type="decimal">
-                    <annotation>
-                        <documentation>Factor applied to metadata's expiration time in order to determine next refresh
-                            time. Must be between 0.0 and 1.0, exclusive.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="maxRefreshDelay" type="duration">
-                    <annotation>
-                        <documentation>Maximum amount time, from the previous, before a metadata refresh cycle runs.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="minRefreshDelay" type="duration">
-                    <annotation>
-                        <documentation>Minimum amount of time, from the previous, before a metadata refresh cycle runs.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="MetadataProviderType" abstract="true">
-        <sequence>
-            <element ref="shibmd:MetadataFilter" minOccurs="0">
-                <annotation>
-                    <documentation>
-                        A filter to be applied to metadata after it has been parsed and validated.
-                    </documentation>
-                </annotation>
-            </element>
-        </sequence>
-        <attribute name="id" type="ID" use="required">
-            <annotation>
-                <documentation>A unique identifier that may be used to identify a particular provider</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="requireValidMetadata" type="boolean">
-            <annotation>
-                <documentation>
-                    A boolean flag indicating whether the
-                    metadata retrieved must be valid. At a minimum, metadata is
-                    valid only if the date expressed in
-                    entity's validUntil attribute has not passed. Specific
-                    implementations may add additional
-                    constraints.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="failFastInitialization" type="boolean">
-            <annotation>
-                <documentation>Determines if the metadata provider "fails fast" during initialization. This means that
-                    if there is a problem initializing the metadata provider it will stop the IdP from starting.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <element name="MetadataFilter" type="shibmd:MetadataFilterType">
-        <annotation>
-            <documentation>
-                Defines a filter that is applied to SAML2 metadata after it has been parsed and validated.
-                Filters may
-                be used to remove unnecessary information or perform other transformative logic.
-            </documentation>
-        </annotation>
-    </element>
-
-    <complexType name="ChainingFilter">
-        <annotation>
-            <documentation>
-                A filter that executes other filters in the order they appear in the configuration.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataFilterType">
-                <sequence>
-                    <element ref="shibmd:MetadataFilter" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A filter to be applied to metadata after it has been parsed and validated.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="RequiredValidUntil">
-        <annotation>
-            <documentation>
-                A filter that requires the presence of a validUntil attribute on the root of the metadata
-                and,
-                optionally, requires that that date not be more than some amount of time in the future.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataFilterType">
-                <attribute name="maxValidityInterval" type="string">
-                    <annotation>
-                        <documentation>
-                            The maximum amount of time, from now, which the validUntil attribute may be set.
-                            This provides an upper limit to the lifetime of any metadata.
-
-                            Interval is expressed in
-                            ISO8601 duration notation.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SchemaValidation">
-        <annotation>
-            <documentation>
-                A filter that checks, and optionally requires, the signature on the top level of the incoming
-                metadata.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataFilterType">
-                <sequence>
-                    <element name="ExtensionSchema" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Classpath location of schema files that will be used, in addition to those
-                                included in
-                                OpenSAML, to validate an incoming metadata file.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SignatureValidation">
-        <annotation>
-            <documentation>
-                A filter that checks, and optionally requires, the signature on the top level of the incoming
-                metadata.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataFilterType">
-                <attribute name="trustEngineRef" use="required">
-                    <annotation>
-                        <documentation>The ID of the trust engine used to validate the signature.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="requireSignedMetadata" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether a signature is required on incoming metadata.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="EntityRoleWhiteList">
-        <annotation>
-            <documentation>
-                A filter that removes roles, from an entity descriptor, that do not appear in the filters
-                whitelist.
-                Optionally an entity descriptor may be completely removed if it does not contain at least one
-                role after
-                the filter. Entity descriptors may be removed if they do not contain at least one entity or
-                entities
-                descriptor after the filtering.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="shibmd:MetadataFilterType">
-                <sequence>
-                    <element name="RetainedRole" type="QName" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                The effective QName for the roles which should not NOT be removed by the
-                                filter. The
-                                effective name is the element name for those roles defined within the SAML
-                                metadata
-                                specification and the schema type name for those that are not.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="removeRolelessEntityDescriptors" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating that entity descriptors that do not contain at least
-                            one role,
-                            after filtering, should be removed.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="removeEmptyEntitiesDescriptors" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating that entities descriptors that do not contain at least
-                            one entity
-                            or entities descriptor, after filtering, shouldbe removed.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="MetadataFilterType" abstract="true"/>
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-profile-handler.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-profile-handler.xsd.svn-base
deleted file mode 100644
index 0543c39..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-profile-handler.xsd.svn-base
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
-    <xsd:annotation>
-        <xsd:documentation>
-            Schema for configuring and mapping request paths to profile handlers.
-
-            This schema is meant to act as a chameleon schema.
-        </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:complexType name="VelocityErrorHandler">
-        <xsd:annotation>
-            <xsd:documentation>
-                Error handler that renders an error page by evaluating a velocity template.
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="ErrorHandlerType">
-                <xsd:attribute name="errorTemplatePath" type="xsd:string">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            Classpath path to the velocity template used to render the error page output.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                <xsd:attribute name="velocityEngine" type="xsd:string" default="shibboleth.VelocityEngine">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            Name of the Spring configured Velocity engine. Deployers should almost never change this
-                            value.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="JSPErrorHandler">
-        <xsd:annotation>
-            <xsd:documentation>
-                Error handler that redirects to a JSP page in order to render an error message to the user.
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="ErrorHandlerType">
-                <xsd:attribute name="jspPagePath" type="xsd:string">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            Path to the JSP page. This path may be absolute (i.e. start with a "/"), in which case the
-                            path is assumed to be from the root of the servlet context, or relative, in which case the
-                            page is assumed to be relative from the request dispatcher location. Deployers are strongly
-                            encouraged to use absolute paths.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="ErrorHandlerType" abstract="true">
-        <xsd:complexContent>
-            <xsd:extension base="RequestHandlerType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="ShibbolethProfileHandlerType" abstract="true">
-        <xsd:complexContent>
-            <xsd:extension base="RequestURIMappedProfileHandlerType">
-                <xsd:attribute name="parserPoolRef" type="xsd:string" default="shibboleth.ParserPool">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            The name of the parser pool used by the profile handler.
-                            
-                            This setting should not be changed from its default unless the deployer fully understands
-                            the inter-relationship between IdP components.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                <xsd:attribute name="storageServiceRef" type="xsd:string" default="shibboleth.StorageService">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            The name of the storage service used by the profile handler.
-                            
-                            This setting should not be changed from its default unless the deployer fully understands
-                            the inter-relationship between IdP components.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                <xsd:attribute name="relyingPartyManagerId" type="xsd:string" default="shibboleth.RelyingPartyConfigurationManager">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            The component ID of the relying party configuration manager to use with the profile handler.
-
-                            This setting should not be changed from its default unless the deployer fully understands
-                            the inter-relationship between IdP components.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                <xsd:attribute name="sessionManagerId" type="xsd:string" default="shibboleth.SessionManager">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            The component ID of the session manager to use with the profile handler.
-
-                            This setting should not be changed from its default unless the deployer fully understands
-                            the inter-relationship between IdP components.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="RequestURIMappedProfileHandlerType" abstract="true">
-        <xsd:complexContent>
-            <xsd:extension base="RequestHandlerType">
-                <xsd:sequence>
-                    <xsd:element name="RequestPath" maxOccurs="unbounded" type="xsd:string">
-                        <xsd:annotation>
-                            <xsd:documentation>
-                                Indicates the request path that maps to this profile handler.
-                            </xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                </xsd:sequence>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="RequestHandlerType" abstract="true"/>
-
-</xsd:schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-relying-party-saml.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-relying-party-saml.xsd.svn-base
deleted file mode 100644
index bac5aad..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-relying-party-saml.xsd.svn-base
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:samlrp="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:rp="urn:mace:shibboleth:2.0:relying-party" targetNamespace="urn:mace:shibboleth:2.0:relying-party:saml" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:relying-party" schemaLocation="classpath:/schema/shibboleth-2.0-relying-party.xsd"/>
-
-    <complexType name="SAML2ArtifactResolutionProfile">
-        <annotation>
-            <documentation>SAML 2.0 artifact query communication profile configuration.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML2ProfileConfigurationType">
-                <attribute name="securityPolicyRef" type="string" default="shibboleth.SAML2ArtifactResolutionSecurityPolicy">
-                    <annotation>
-                        <documentation>
-                            Reference, by ID, to the security policy to use for this profile.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2AttributeQueryProfile">
-        <annotation>
-            <documentation>SAML 2.0 attribute query communication profile configuration.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML2ProfileConfigurationType">
-                <attribute name="securityPolicyRef" type="string" default="shibboleth.SAML2AttributeQuerySecurityPolicy">
-                    <annotation>
-                        <documentation>
-                            Reference, by ID, to the security policy to use for this profile.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2LogoutRequestProfile">
-        <annotation>
-            <documentation>SAML 2.0 logout request communication profile configuration.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML2ProfileConfigurationType">
-                <attribute name="securityPolicyRef" type="string" default="shibboleth.SAML2SLOSecurityPolicy">
-                    <annotation>
-                        <documentation>
-                            Reference, by ID, to the security policy to use for this profile.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2ECPProfile">
-        <annotation>
-            <documentation>SAML 2.0 ECP single sign-on communication profile configuration.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML2SSOProfile"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2SSOProfile">
-        <annotation>
-            <documentation>SAML 2.0 single sign-on communication profile configuration.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML2ProfileConfigurationType">
-                <attribute name="localityAddress" type="string">
-                    <annotation>
-                        <documentation>
-                            Deprecated, never implemented.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="localityDNSName" type="string">
-                    <annotation>
-                        <documentation>
-                            Deprecated, never implemented.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="includeAttributeStatement" type="boolean">
-                    <annotation>
-                        <documentation>
-                            Boolean flag indicating whether an attribute statement should be included with the
-                            authentication statement in the response sent back to the relying party.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="securityPolicyRef" type="string" default="shibboleth.SAML2SSOSecurityPolicy">
-                    <annotation>
-                        <documentation>
-                            Reference, by ID, to the security policy to use for this profile.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="maximumSPSessionLifetime" type="string">
-                    <annotation>
-                        <documentation>
-                            The maximum amount of time the service provider should maintain a session
-                            for the user based on the authentication assertion.  This attribute is converted into the 
-                            SessionNotOnOrAfter attribute of the AuthnStatement. If no value is supplied then the
-                            SessionNotOnOrAfter attribute is not sent within the AuthnStatement.
-                            
-                            Lifetime is expressed in ISO8601 duration notation.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="skipEndpointValidationWhenSigned" type="boolean">
-                    <annotation>
-                        <documentation>
-                            If true, allows signed AuthnRequests to bypass validation of the response
-                            location against metadata, if a location is specified in the request.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2ProfileConfigurationType" abstract="true">
-        <annotation>
-            <documentation>Base type for SAML 2.0 communication profile configurations.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAMLProfileConfigurationType">
-                <sequence>
-                    <element name="ProxyAudience" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>List of audiences for proxied assertions.</documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="encryptNameIds" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>A flag indicating whether NameIDs should be encrypted.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="encryptAssertions" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>A flag indicating whether assertions should be encrypted.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="assertionProxyCount" type="nonNegativeInteger">
-                    <annotation>
-                        <documentation>The maximum number of times an assertion may be proxied.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="attributeAuthority" type="string" default="shibboleth.SAML2AttributeAuthority">
-                    <annotation>
-                        <documentation>
-                            Name of the attribute authority component to make available within this configuration.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML1ArtifactResolutionProfile">
-        <annotation>
-            <documentation>SAML 1.0 and 1.1 artifact query communication profile configurations.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML1ProfileConfigurationType">
-                <attribute name="securityPolicyRef" type="string" default="shibboleth.SAML1ArtifactResolutionSecurityPolicy">
-                    <annotation>
-                        <documentation>
-                            Reference, by ID, to the security policy to use for this profile.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML1AttributeQueryProfile">
-        <annotation>
-            <documentation>SAML 1.0 and 1.1 attribute query communication profile configurations.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML1ProfileConfigurationType">
-                <attribute name="securityPolicyRef" type="string" default="shibboleth.SAML1AttributeQuerySecurityPolicy">
-                    <annotation>
-                        <documentation>
-                            Reference, by ID, to the security policy to use for this profile.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="ShibbolethSSOProfile">
-        <annotation>
-            <documentation>Shibboleth 1 single sign-on communication profile configurations.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAML1ProfileConfigurationType">
-                <attribute name="localityAddress" type="string">
-                    <annotation>
-                        <documentation>
-                            Deprecated, never implemented.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="localityDNSName" type="string">
-                    <annotation>
-                        <documentation>
-                            Deprecated, never implemented.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="includeAttributeStatement" type="boolean">
-                    <annotation>
-                        <documentation>
-                            Boolean flag indicating whether an attribute statement should be included with the
-                            authentication statement in the response sent back to the relying party.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="securityPolicyRef" type="string" default="shibboleth.ShibbolethSSOSecurityPolicy">
-                    <annotation>
-                        <documentation>
-                            Reference, by ID, to the security policy to use for this profile.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML1ProfileConfigurationType" abstract="true">
-        <annotation>
-            <documentation>Base type for SAML 1.0 and 1.1 communication profile configurations.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="samlrp:SAMLProfileConfigurationType">
-                <attribute name="attributeAuthority" type="string" default="shibboleth.SAML1AttributeAuthority">
-                    <annotation>
-                        <documentation>
-                            Name of the attribute authority component to make available within this configuration.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAMLProfileConfigurationType" abstract="true">
-        <annotation>
-            <documentation>Base type for SAML (1.0, 1.1, and 2.0) communication profile configurations.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="rp:ProfileConfigurationType">
-                <sequence>
-                    <element name="Audience" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>List of audiences for issued assertions.</documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="assertionLifetime" type="string">
-                    <annotation>
-                        <documentation>
-                            The amount of time before an issued assertion expires.
-                            
-                            Lifetime is expressed in ISO8601 duration notation.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="includeConditionsNotBefore" type="boolean">
-                    <annotation>
-                        <documentation>
-                            Boolean flag indicating whether a NotBefore condition should be included in any
-                            assertions sent back to the relying party.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="outboundArtifactType" type="integer">
-                    <annotation>
-                        <documentation>The artifact type to use when sending an outbound, artifact encoded, message.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="signingCredentialRef" type="string">
-                    <annotation>
-                        <documentation>ID of the credential to use to sign SAML assertions.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="signAssertions" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>
-                            A flag indicating whether issued assertions should be signed. If no signing
-                            credential is provided on this configuration and no default signing credential is provided
-                            on the relying party configuration then signing will not occur regardless of this setting.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="signRequests" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>
-                            A flag indicating whether protocol requests should be signed. If no signing
-                            credential is provided on this configuration and no default signing credential is provided
-                            on the relying party configuration then signing will not occur regardless of this setting.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="signResponses" type="samlrp:cryptoReqType">
-                    <annotation>
-                        <documentation>
-                            A flag indicating whether protocol responses should be signed. If no signing
-                            credential is provided on this configuration and no default signing credential is provided
-                            on the relying party configuration then signing will not occur regardless of this setting.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <simpleType name="cryptoReqType">
-        <annotation>
-            <documentation>Requirement level for crypto functions like signing and encryption</documentation>
-        </annotation>
-        <restriction base="string">
-            <enumeration value="always"/>
-            <enumeration value="conditional"/>
-            <enumeration value="never"/>
-        </restriction>
-    </simpleType>
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-relying-party.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-relying-party.xsd.svn-base
deleted file mode 100644
index 3657bdc..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-relying-party.xsd.svn-base
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:rp="urn:mace:shibboleth:2.0:relying-party" xmlns:security="urn:mace:shibboleth:2.0:security" xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:service="urn:mace:shibboleth:2.0:services" targetNamespace="urn:mace:shibboleth:2.0:relying-party" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:services" schemaLocation="classpath:/schema/shibboleth-2.0-services.xsd"/>
-
-    <import namespace="urn:mace:shibboleth:2.0:metadata" schemaLocation="classpath:/schema/shibboleth-2.0-metadata.xsd"/>
-
-    <import namespace="urn:mace:shibboleth:2.0:security" schemaLocation="classpath:/schema/shibboleth-2.0-security.xsd"/>
-
-    <annotation>
-        <documentation>Schema describing relying party configurations.</documentation>
-    </annotation>
-
-    <complexType name="SAMLMDRelyingPartyConfigurationManager">
-        <annotation>
-            <documentation>
-                Relying party configuration manager that uses SAML metadata when locating profile configurations.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ReloadableServiceType"/>
-        </complexContent>
-    </complexType>
-
-    <element name="RelyingPartyGroup">
-        <annotation>
-            <documentation>Root element of a relying party configuration document.</documentation>
-        </annotation>
-        <complexType>
-            <sequence>
-                <element ref="rp:AnonymousRelyingParty" minOccurs="1"/>
-                <element ref="rp:DefaultRelyingParty" minOccurs="1"/>
-                <element ref="rp:RelyingParty" minOccurs="0" maxOccurs="unbounded"/>
-                <element ref="shibmd:MetadataProvider" minOccurs="0"/>
-                <element ref="security:Credential" minOccurs="0" maxOccurs="unbounded"/>
-                <element ref="security:TrustEngine" minOccurs="0" maxOccurs="unbounded"/>
-                <element ref="security:SecurityPolicy" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-        </complexType>
-    </element>
-
-    <element name="RelyingParty" type="rp:IdentifiedRelyingPartyType">
-        <annotation>
-            <documentation>
-                A set of configuration options specific to a given relying party or group of relying parties as
-                expressed in SAML 2 metadata. Note, configuration options are not inherited from either the default
-                relying party or ancestral groups.
-            </documentation>
-        </annotation>
-    </element>
-
-    <element name="DefaultRelyingParty" type="rp:UnidentifiedRelyingParty">
-        <annotation>
-            <documentation>
-                The default set of configuration options to use for relying parties/groups not specifically called out.
-            </documentation>
-        </annotation>
-    </element>
-
-    <element name="AnonymousRelyingParty" type="rp:UnidentifiedRelyingParty">
-        <annotation>
-            <documentation>
-                The set of configuration options to use for relying parties/groups which are not authenticated or known
-                to the system.
-            </documentation>
-        </annotation>
-    </element>
-
-    <complexType name="IdentifiedRelyingPartyType">
-        <annotation>
-            <documentation>A relying party configuration specific to a particular relying party.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="rp:UnidentifiedRelyingParty">
-                <attribute name="id" type="string" use="required">
-                    <annotation>
-                        <documentation>The entity ID of the relying party.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="UnidentifiedRelyingParty">
-        <annotation>
-            <documentation>
-                Relying party configuration information that is not specific to an identified relying party.
-            </documentation>
-        </annotation>
-        <sequence>
-            <element ref="rp:ProfileConfiguration" minOccurs="0" maxOccurs="unbounded">
-                <annotation>
-                    <documentation>Profile specific configuration information.</documentation>
-                </annotation>
-            </element>
-        </sequence>
-        <attribute name="provider" type="string" use="required">
-            <annotation>
-                <documentation>
-                    The entity ID the responder should use when communicating with the relying party.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="defaultAuthenticationMethod" type="string">
-            <annotation>
-                <documentation>
-                    The authentication method to use to authenticate the user, if one is not specified within the
-                    request. This method must be one of the methods handled by one of the authentication handlers
-                    defined for the system.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="defaultSigningCredentialRef" type="string">
-            <annotation>
-                <documentation>
-                    The ID of the default signing credential for the relying party. This is provided as a convenience
-                    method so that this credential need not be defined on every signing supporting profile
-                    configuration. If a profile configuration has a defined signing credential it must be used in place
-                    of the credential retrieved here.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="nameIDFormatPrecedence" type="string">
-            <annotation>
-                <documentation>
-                    A space delimited list that provides a precedence for NameID format to be used with the relying party.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <element name="ProfileConfiguration" type="rp:ProfileConfigurationType"/>
-    <complexType name="ProfileConfigurationType" abstract="true">
-        <annotation>
-            <documentation>
-                An abstract type from which all profile specific configuration types are derived.
-            </documentation>
-        </annotation>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-resource.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-resource.xsd.svn-base
deleted file mode 100644
index 8b881f5..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-resource.xsd.svn-base
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:res="urn:mace:shibboleth:2.0:resource" targetNamespace="urn:mace:shibboleth:2.0:resource" elementFormDefault="qualified">
-
-    <complexType name="ClasspathResource">
-        <complexContent>
-            <extension base="res:ResourceType">
-                <attribute name="file" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The file, within the JVM classpath, this resource represents.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="FilesystemResource">
-        <complexContent>
-            <extension base="res:ResourceType">
-                <attribute name="file" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The file this resource represents.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="HttpResource">
-        <complexContent>
-            <extension base="res:ResourceType">
-                <attribute name="url" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The URL this resource represents.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="FileBackedHttpResource">
-        <complexContent>
-            <extension base="res:ResourceType">
-                <attribute name="url" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The URL this resource represents.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="file" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The file the resource will be saved to and read from when the URL resource is not available.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SVNResource">
-        <complexContent>
-            <extension base="res:ResourceType">
-                <attribute name="repositoryURL" type="string" use="required"/>
-                <attribute name="connectionTimeout" type="string"/>
-                <attribute name="readTimeout" type="string"/>
-                <attribute name="workingCopyDirectory" type="string" use="required"/>
-                <attribute name="revision" type="positiveInteger"/>
-                <attribute name="resourceFile" type="string" use="required"/>
-                <attribute name="username" type="string"/>
-                <attribute name="password" type="string"/>
-                <attribute name="proxyHost" type="string"/>
-                <attribute name="proxyPort" type="positiveInteger"/>
-                <attribute name="proxyUsername" type="string"/>
-                <attribute name="proxyPassword" type="string"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="ResourceType" abstract="true">
-        <sequence>
-            <element ref="res:ResourceFilter" minOccurs="0"/>
-        </sequence>
-    </complexType>
-    
-    <complexType name="PropertyReplacement">
-        <annotation>
-            <documentation>
-                A resource filter that replaces ${KEY} macros with the values associated with the KEY in a property 
-                file.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="res:ResourceFilterType">
-                <attribute name="propertyFile" type="string" use="required">
-                    <annotation>
-                        <documentation> Path to the Java property file used during macro expansion.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="Chaining">
-        <annotation>
-            <documentation>A resource filter that executes the child filters in the order they defined.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="res:ResourceFilterType">
-                <sequence>
-                    <element ref="res:ResourceFilter" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <element name="ResourceFilter" type="res:ResourceFilterType"/>
-    <complexType name="ResourceFilterType" abstract="true"/>
-    
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-security-policy-saml.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-security-policy-saml.xsd.svn-base
deleted file mode 100644
index aa39b01..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-security-policy-saml.xsd.svn-base
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:samlsec="urn:mace:shibboleth:2.0:security:saml" xmlns:sec="urn:mace:shibboleth:2.0:security" targetNamespace="urn:mace:shibboleth:2.0:security:saml" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:security" schemaLocation="classpath:/schema/shibboleth-2.0-security.xsd"/>
-    
-    <complexType name="ProtocolWithXMLSignature">
-        <annotation>
-            <documentation>
-                A rule that checks the signature on SAML protocol messages.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType">
-                <attribute name="trustEngineRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            Reference to the trust engine used to validate the signature. 
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SAML2AuthnRequestsSigned">
-        <annotation>
-            <documentation>
-                A rule that requires that an incoming SAML 2 AuthnRequest be signed
-                if this requirement is indicated in metadata via the request issuer's 
-                SPSSODescriptor AuthnRequestsSigned attribute value.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SAML2HTTPPostSimpleSign">
-        <annotation>
-            <documentation>
-                A rule that checks the signature on SAML protocol messages.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType">
-                <attribute name="trustEngineRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            Reference to the trust engine used to validate the signature. 
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="parserPoolRef" type="string" default="shibboleth.ParserPool">
-                    <annotation>
-                        <documentation>
-                            Reference to the parser pool used to parse incoming XML message.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SAML2HTTPRedirectSimpleSign">
-        <annotation>
-            <documentation>
-                A rule that checks the signature on SAML protocol messages.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType">
-                <attribute name="trustEngineRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            Reference to the trust engine used to validate the signature. 
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="MandatoryIssuer">
-        <annotation>
-            <documentation>
-                A rule that requires that the issuer of the inbound SAML message, within the message context, be
-                populated.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="IssueInstant">
-        <annotation>
-            <documentation>
-                A rule that inspects the message issue instant and ensures that it is within a certain timeframe.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType">
-                <attribute name="expirationThreshold" type="string">
-                    <annotation>
-                        <documentation>
-                            Time after a message is issued before it is considered expired.
-                            
-                            Threshold is expressed in ISO8601 duration notation.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="clockSkew" type="string">
-                    <annotation>
-                        <documentation>
-                            Defines the valid life time of a message issue instant as: (instant - skew) < now >
-                            (instant + expirationThreshold + skew)
-                            
-                            Skew is expressed in ISO8601 duration notation.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="required" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether this rule is required to be evaluated.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Replay">
-        <annotation>
-            <documentation>
-                A security policy rule that ensure a received SAML message has not already been processed.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType">
-                <attribute name="replayCacheRef" type="string" default="shibboleth.ReplayCache">
-                    <annotation>
-                        <documentation>Name of the replay cache to use.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="required" type="boolean">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether this rule is required to be evaluated.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-security.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-security.xsd.svn-base
deleted file mode 100644
index 5871d7a..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-security.xsd.svn-base
+++ /dev/null
@@ -1,755 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sec="urn:mace:shibboleth:2.0:security" targetNamespace="urn:mace:shibboleth:2.0:security" elementFormDefault="qualified">
-        
-    <!-- CREDENTIAL RELATED OBJECTS -->
-    <element name="Credential" type="sec:CredentialType"/>
-
-    <complexType name="X509Inline">
-        <annotation>
-            <documentation>
-                Allows credentials to be components to be specified as content within the child elements. Keys,
-                Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:X509Credential"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="X509Filesystem">
-        <annotation>
-            <documentation>
-                Allows credential components to be specified by filesystem path. Keys, Certificates, and CRLs may be
-                PKCS#12, DER, or PEM encoded and may be encrypted or not.
-                
-                This method is deprecated in favor of the X509ResourceBacked type employing a filesystem resource.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:X509Credential"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="X509ResourceBacked">
-        <annotation>
-            <documentation>
-                Allows credential components to be retrieved via a resource. Keys, Certificates, and CRLs may be
-                PKCS#12, DER, or PEM encoded and may be encrypted or not.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:X509Credential"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="X509Credential" abstract="true">
-        <annotation>
-            <documentation>
-                Defines the components of an X.509 credential.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:CredentialType">
-                <sequence>
-                    <element name="PrivateKey" minOccurs="0">
-                        <annotation>
-                            <documentation>Credential's RSA/DSA private key.</documentation>
-                        </annotation>
-                    </element>
-                    <element name="Certificate" minOccurs="1" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Certificate associated with the credential. More than one certificate
-                                may be present within a single element, if the encoding form used allows
-                                it, or multiple certificate elements may be used, or both.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="CRL" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Certificate revocation list associated with the Credential. More than
-                                one CRL may be present within a single element, if the encoding form
-                                used allows it, or multiple CRL elements may be used, or both.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="BasicInline">
-        <annotation>
-            <documentation>
-                Allows credentials to be components to be specified as content within the child elements.
-                Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:BasicCredential"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="BasicFilesystem">
-        <annotation>
-            <documentation>
-                Allows credential components to be specified by filesystem path.
-                Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-                
-                This method is deprecated in favor of the BasicResourceBacked type 
-                employing a filesystem resource.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:BasicCredential"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="BasicResourceBacked">
-        <annotation>
-            <documentation>
-                Allows credential components to be read from resources.
-                Keys may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:BasicCredential"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="BasicCredential" abstract="true">
-        <annotation>
-            <documentation>
-                Defines the components of a basic credential containing either a 
-                public key and optional private key, or a symmetric (secret) key.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:CredentialType">
-                <sequence>
-                    <choice>
-                        <element name="SecretKey">
-                            <annotation>
-                                <documentation>Credential's symmetric key.</documentation>
-                            </annotation>
-                        </element>
-                        <sequence>
-                            <element name="PrivateKey" minOccurs="0">
-                                <annotation>
-                                    <documentation>Credential's RSA/DSA private key.</documentation>
-                                </annotation>
-                            </element>
-                            <element name="PublicKey">
-                                <annotation>
-                                    <documentation>Credential's RSA/DSA public key.</documentation>
-                                </annotation>
-                            </element>
-                        </sequence>
-                    </choice>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="CredentialType" abstract="true">
-        <annotation>
-            <documentation>Base type for credential information.</documentation>
-        </annotation>
-        <sequence>
-            <element name="KeyName" type="string" minOccurs="0" maxOccurs="unbounded">
-                <annotation>
-                    <documentation>Name(s) of the key this credential represents.</documentation>
-                </annotation>
-            </element>
-        </sequence>
-        <attribute name="id" type="string">
-            <annotation>
-                <documentation>Unique id for this credential.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="entityID" type="string">
-            <annotation>
-                <documentation>Identifier for the entity which owns this credential.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="usage" type="sec:CredentialUsageType">
-            <annotation>
-                <documentation>
-                    Usage type for this credential. Acceptable values are "Encryption" or "Signing". If no usage type is
-                    given components may choose to use the credential for either encryption or signing operations.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <simpleType name="CredentialUsageType">
-        <restriction base="string">
-            <enumeration value="Encryption"/>
-            <enumeration value="Signing"/>
-        </restriction>
-    </simpleType>
-
-    <complexType name="PasswordBearingString">
-        <simpleContent>
-            <extension base="string">
-                <attribute name="password" type="string">
-                    <annotation>
-                        <documentation>
-                            Password associated with the resource identified by elements of this type.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </simpleContent>
-    </complexType>
-    
-    <!-- VALIDATION RELATED OBJECTS, FOR EXAMPLE PKIX INFO -->
-    <element name="ValidationInfo" type="sec:ValidationInfoType"/>
-    
-    <element name="ValidationOptions" type="sec:ValidationOptionsType"/>
-    
-    <complexType name="PKIXInline">
-        <annotation>
-            <documentation>
-                Allows PKIX validation info components to be specified as content within the child elements.
-                Certificates and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:PKIXValidationInfoType"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="PKIXFilesystem">
-        <annotation>
-            <documentation>
-                Allows PKIX validation info components to be specified by filesystem path.
-                Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-                
-                This method is deprecated in favor of the PKIXResourceBacked type employing a filesystem resource.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:PKIXValidationInfoType"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="PKIXResourceBacked">
-        <annotation>
-            <documentation>
-                Allows PKIX validation info components read from configured resources.
-                Certificates, and CRLs may be PKCS#12, DER, or PEM encoded and may be encrypted or not.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:PKIXValidationInfoType"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="PKIXValidationInfoType" abstract="true">
-        <annotation>
-            <documentation>
-                Defines the components of a set of PKIX validation information.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:ValidationInfoType">
-                <sequence>
-                    <element name="Certificate" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Trusted certificates, typically of root and intermediate CA's , which are used
-                                as input to the PKIX validation process.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="CRL" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Certificate revocation lists which are used as input to the PKIX validation process.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="verifyDepth" type="unsignedByte">
-                    <annotation>
-                        <documentation>
-                            The maximum path verification depth to consider when constructing a PKIX cert path.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="ValidationInfoType" abstract="true">
-        <annotation>
-            <documentation>Base type for validation information.</documentation>
-        </annotation>
-        <attribute name="id" type="string" use="required">
-            <annotation>
-                <documentation>Unique id for this validation info set.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-    
-    <complexType name="ValidationOptionsType">
-        <annotation>
-            <documentation>Type for basic PKIX validation options set for PKIX trust engines.</documentation>
-        </annotation>
-        <attribute name="processEmptyCRLs" type="boolean">
-            <annotation>
-                <documentation>Flag as to whether empty CRL's will be processed. Defaults to true.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="processExpiredCRLs" type="boolean">
-            <annotation>
-                <documentation>Flag as to whether expired CRL's will be processed. Defaults to true.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="processCredentialCRLs" type="boolean">
-            <annotation>
-                <documentation>
-                    Flag as to whether CRL's supplied in the untrusted credential 
-                    being evaluated will be processed. Defaults to true.
-                </documentation>
-            </annotation>
-        </attribute>
-        <attribute name="defaultVerificationDepth" type="unsignedInt">
-            <annotation>
-                <documentation>Default PKIX path verification depth. Defaults to 1.</documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-    
-    <complexType name="CertPathValidationOptionsType">
-        <annotation>
-            <documentation>
-                Type specialization for PKIX validation options set for PKIX trust engines 
-                using the Java CertPath API.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:ValidationOptionsType">
-                <sequence>
-                    <element name="PolicyOID" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Sets the initial policy identifiers (OID strings) for the underlying CertPath Provider,
-                                i.e. those policies that are acceptable to the certificate user.
-                                See also RFC 5280, section 6.1.1 (c).
-                                If no policy identifier is specified, any policy is considered acceptable.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="forceRevocationEnabled" type="boolean">
-                    <annotation>
-                        <documentation>
-                            If true, the revocation behavior of the underlying CertPath provider will be forced to the
-                            value supplied by the revocationEnabled attribute. If false, the revocation behavior
-                            of the underlying provider will be determined by the PKIXTrustEvaluator implementation.
-                            Defaults to false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="revocationEnabled" type="boolean">
-                    <annotation>
-                        <documentation>
-                            If the attribute forceRevocationEnabled is true, the revocation behavior of the underlying CertPath
-                            Provider will be forced to this value. If the former is false, the revocation behavior
-                            of the underlying provider will be determined by the PKIXTrustEvaluator implementation.
-                            Defaults to true.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="policyMappingInhibit" type="boolean">
-                    <annotation>
-                        <documentation>
-                            Sets the policy mapping inhibited flag for the underlying CertPath Provider.
-                            See also RFC 5280, section 6.1.1 (e).
-                            Defaults to false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="anyPolicyInhibit" type="boolean">
-                    <annotation>
-                        <documentation>
-                            Sets the any policy inhibited flag for the underlying CertPath Provider.
-                            See also RFC 5280, section 6.1.1 (g).
-                            Defaults to false.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-            </complexContent>
-    </complexType>
-    
-    <!-- TRUST ENGINE RELATED OBJECTS -->
-    <element name="TrustEngine" type="sec:TrustEngineType"/>
-    
-    <complexType name="Chaining">
-        <annotation>
-            <documentation>
-                Trust engine which chains together other trust engine instances, evaluating a token
-                against each engine in chain order.
-                
-                If the token to be evaluated can be established as trusted by one member of the chain,
-                then the token is trusted.  Otherwise it is evaluated as untrusted.
-                
-                Trust chain members must all evaluate tokens of a compatible type,
-                for example a Credential or Signature.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <choice minOccurs="1" maxOccurs="unbounded">
-                    <element ref="sec:TrustEngine"/>
-                    <element name="TrustEngineRef">
-                        <annotation>
-                            <documentation>Reference to a trust engine.</documentation>
-                        </annotation>
-                        <complexType>
-                            <attribute name="ref">
-                                <annotation>
-                                    <documentation>Bean reference id for a trust engine declared elsewhere.</documentation>
-                                </annotation>
-                            </attribute>
-                        </complexType>
-                    </element>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SignatureChaining">
-        <annotation>
-            <documentation>
-                Trust engine which chains together other signature trust engine instances, evaluating the signature
-                against each engine in chain order.
-                
-                If the signature to be evaluated can be established as trusted by one member of the chain,
-                then the signature is trusted.  Otherwise it is evaluated as untrusted.
-                
-                Trust chain members must all evaluate signatures.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <choice minOccurs="1" maxOccurs="unbounded">
-                    <element ref="sec:TrustEngine"/>
-                    <element name="TrustEngineRef">
-                        <annotation>
-                            <documentation>Reference to a trust engine.</documentation>
-                        </annotation>
-                        <complexType>
-                            <attribute name="ref">
-                                <annotation>
-                                    <documentation>Bean reference id for a trust engine declared elsewhere.</documentation>
-                                </annotation>
-                            </attribute>
-                        </complexType>
-                    </element>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <!-- Trust engines which use metadata provider-based resolvers -->
-    <complexType name="MetadataExplicitKey">
-        <annotation>
-            <documentation>
-                Trust engine used to validate a key against trusted keys obtained from metadata.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <attribute name="metadataProviderRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The ID of the metadata provider used to look up trust information.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="MetadataPKIXX509Credential">
-        <annotation>
-            <documentation>
-                Trust engine used to validate an X509 credential against PKIX information from metadata.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <sequence>
-                    <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
-                        <annotation>
-                            <documentation>
-                                Set of options to influence PKIX trust validation processing.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="metadataProviderRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The ID of the metadata provider used to look up trust information.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="MetadataExplicitKeySignature">
-        <annotation>
-            <documentation>
-                Trust engine used to validate signatures with keys from metadata.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <attribute name="metadataProviderRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The ID of the metadata provider used to look up trust information.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="MetadataPKIXSignature">
-        <annotation>
-            <documentation>
-                Trust engine used to validate signatures with PKIX-validated certificates from metadata.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <sequence>
-                    <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
-                        <annotation>
-                            <documentation>
-                                Set of options to influence PKIX trust validation processing.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="metadataProviderRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            The ID of the metadata provider used to look up trust information.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <!-- Trust engines which use resolvers configured via static information -->
-    <complexType name="StaticExplicitKey">
-        <annotation>
-            <documentation>
-                Trust engine used to validate a key against statically-configured trusted keys.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <sequence>
-                    <element ref="sec:Credential" minOccurs="1" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A trusted credential to be included in the static trusted credential set.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="StaticPKIXX509Credential">
-        <annotation>
-            <documentation>
-                Trust engine used to validate an X509 credential against statically-configured PKIX information.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <sequence>
-                    <element name="TrustedName" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Specifies an optional trusted name against which the target entity 
-                                certificate's public key must be bound for trust processing to be successful.
-                                
-                                Supported trusted name formats are:
-                                1) Subject DN in RFC 2253 or RFC 1779 format
-                                2) CN component of subject DN
-                                3) Subject alt names (DNS and URI types)
-                                
-                                If multiple instances of this element are present, trust processing
-                                is successful if the target entity certificate matches at least one of them.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="sec:ValidationInfo" minOccurs="1" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                PKIX validation info against which to validate an X509 credential.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
-                        <annotation>
-                            <documentation>
-                                Set of options to influence PKIX trust validation processing.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="StaticExplicitKeySignature">
-        <annotation>
-            <documentation>
-                Trust engine used to validate a signature against statically-configured trusted keys.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <sequence>
-                    <element ref="sec:Credential" minOccurs="1" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A trusted credential to be included in the static trusted credential set.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="StaticPKIXSignature">
-        <annotation>
-            <documentation>
-                Trust engine used to validate signatures against statically-configured PKIX information.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:TrustEngineType">
-                <sequence>
-                    <element name="TrustedName" type="string" minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Specifies an optional trusted name against which the target entity 
-                                certificate's public key must be bound for trust processing to be successful.
-                                
-                                Supported trusted name formats are:
-                                1) Subject DN in RFC 2253 or RFC 1779 format
-                                2) CN component of subject DN
-                                3) Subject alt names (DNS and URI types)
-                                
-                                If multiple instances of this element are present, trust processing
-                                is successful if the target entity certificate matches at least one of them.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="sec:ValidationInfo" minOccurs="1" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                PKIX validation info against which to validate a signature.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="sec:ValidationOptions" minOccurs="0" maxOccurs="1">
-                        <annotation>
-                            <documentation>
-                                Set of options to influence PKIX trust validation processing.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="TrustEngineType" abstract="true">
-        <attribute name="id" type="string" use="required">
-            <annotation>
-                <documentation>
-                    Unique ID of the trust engine.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-    
-    <!-- SECURITY POLICY RELATED OBJECTS -->
-    <element name="SecurityPolicy" type="sec:SecurityPolicyType"/>
-    <complexType name="SecurityPolicyType">
-        <annotation>
-            <documentation>
-                Security policies define a set of rules that are evaluated against incoming messages to
-                determine whether the messages should be processed.
-            </documentation>
-        </annotation>
-        <sequence>
-            <element ref="sec:Rule" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="id" type="string" use="required">
-            <annotation>
-                <documentation>
-                    A unique ID for the policy.
-                </documentation>
-            </annotation>
-        </attribute>
-    </complexType>
-
-    <element name="Rule" type="sec:SecurityPolicyRuleType"/>
-    
-    <complexType name="MandatoryMessageAuthentication">
-        <annotation>
-            <documentation>
-                A security rule that requires that an incoming message be authenticated.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="ClientCertAuth">
-        <annotation>
-            <documentation>
-                A security rule that validates a client certificate, available from the inbound transport, with a trust engine.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="sec:SecurityPolicyRuleType">
-                <attribute name="trustEngineRef" type="string" use="required">
-                    <annotation>
-                        <documentation>
-                            Reference to the trust engine used to validate the signature. 
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SecurityPolicyRuleType" abstract="true">
-        <annotation>
-            <documentation>
-                Base type of security policy rules.
-            </documentation>
-        </annotation>
-    </complexType>
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-services.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-2.0-services.xsd.svn-base
deleted file mode 100644
index 9f93a79..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-2.0-services.xsd.svn-base
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:service="urn:mace:shibboleth:2.0:services" xmlns:res="urn:mace:shibboleth:2.0:resource" targetNamespace="urn:mace:shibboleth:2.0:services" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:resource" schemaLocation="classpath:/schema/shibboleth-2.0-resource.xsd"/>
-
-    <annotation>
-        <documentation>Schema describing a set of isolated services used by Shibboleth.</documentation>
-    </annotation>
-    
-    <element name="Services" type="service:ServicesType"/>
-    <complexType name="ServicesType">
-        <sequence>
-            <element ref="service:Service" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <element name="Service" type="service:ServiceType"/>
-    <complexType name="ReloadableServiceType" abstract="true">
-        <annotation>
-            <documentation>
-                A service that periodically checks if its configuration resources have changed. If a change has occurred
-                the service will reload its configuration.
-
-                If no polling frequency is specified this service will not reload its configuration files.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ServiceType">
-                <attribute name="timerId" type="string" default="shibboleth.TaskTimer">
-                    <annotation>
-                        <documentation>
-                            Component ID for the task timer used to schedule configuration file polling.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="configurationResourcePollingFrequency" type="string">
-                    <annotation>
-                        <documentation>
-                            The frequency the configuration resources should be polled for changes.
-                            
-                            Frequency is expressed in ISO8601 duration notation.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="configurationResourcePollingRetryAttempts" type="nonNegativeInteger">
-                    <annotation>
-                        <documentation>
-                            The number of times a particular resource should be retried if an error is encountered
-                            reading its content.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="ServletContextAttributeExporter">
-        <annotation>
-            <documentation>
-                A service that exports all services that it depends on into the servlet context.
-                This requires that the loading application context is a WebApplicationContext.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="service:ServiceType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="ServiceType" abstract="true">
-        <annotation>
-            <documentation>
-                A service that maintains its own Spring ApplicationContext loaded with the given configuration
-                resources.
-            </documentation>
-        </annotation>
-        <sequence>
-            <element name="ConfigurationResource" type="res:ResourceType" minOccurs="0" maxOccurs="unbounded">
-                <annotation>
-                    <documentation>
-                        The configuration resources to load into the services ApplicationContext.
-                    </documentation>
-                </annotation>
-            </element>
-        </sequence>
-        <attribute name="id" type="string" use="required">
-            <annotation>
-                <documentation>The application unique name of the service.</documentation>
-            </annotation>
-        </attribute>
-        <attribute name="depends-on">
-            <annotation>
-                <documentation>
-                    The services, identified by a space separated list of their IDs, upon which this service depends.
-                </documentation>
-            </annotation>
-            <simpleType>
-                <list itemType="string"/>
-            </simpleType>
-        </attribute>
-    </complexType>
-
-</schema>
diff --git a/src/main/resources/schema/.svn/text-base/shibboleth-metadata-1.0.xsd.svn-base b/src/main/resources/schema/.svn/text-base/shibboleth-metadata-1.0.xsd.svn-base
deleted file mode 100644
index 00545d6..0000000
--- a/src/main/resources/schema/.svn/text-base/shibboleth-metadata-1.0.xsd.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" targetNamespace="urn:mace:shibboleth:metadata:1.0" elementFormDefault="unqualified" attributeFormDefault="unqualified" version="1.0">
-
-	<import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="classpath:/schema/xmldsig-core-schema.xsd"/>
-
-	<element name="Scope">
-		<annotation>
-			<documentation>
-			SAML metadata extension used to regulate allowable attribute scopes.
-			</documentation>
-		</annotation>
-		<complexType>
-			<simpleContent>
-				<extension base="string">
-					<attribute name="regexp" type="boolean" use="optional" default="false"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-
-	<element name="KeyAuthority">
-		<annotation>
-			<documentation>
-			Binds keying authorities to the system entity/entities to which the enclosing
-			metadata element applies.
-			</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="ds:KeyInfo" maxOccurs="unbounded"/>
-			</sequence>
-			<attribute name="VerifyDepth" type="unsignedByte" use="optional" default="1"/>
-			<anyAttribute namespace="##other" processContents="lax"/>
-		</complexType>
-	</element>
-
-</schema>
diff --git a/src/test/.svn/all-wcprops b/src/test/.svn/all-wcprops
deleted file mode 100644
index 726666b..0000000
--- a/src/test/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 55
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test
-END
diff --git a/src/test/.svn/entries b/src/test/.svn/entries
deleted file mode 100644
index f53c8dc..0000000
--- a/src/test/.svn/entries
+++ /dev/null
@@ -1,34 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-resources
-dir
-

-java
-dir
-

diff --git a/src/test/java/.svn/all-wcprops b/src/test/java/.svn/all-wcprops
deleted file mode 100644
index 2b9d8b2..0000000
--- a/src/test/java/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java
-END
diff --git a/src/test/java/.svn/entries b/src/test/java/.svn/entries
deleted file mode 100644
index 3738452..0000000
--- a/src/test/java/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-edu
-dir
-

diff --git a/src/test/java/edu/.svn/all-wcprops b/src/test/java/edu/.svn/all-wcprops
deleted file mode 100644
index 080343b..0000000
--- a/src/test/java/edu/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java/edu
-END
diff --git a/src/test/java/edu/.svn/entries b/src/test/java/edu/.svn/entries
deleted file mode 100644
index cf5a6de..0000000
--- a/src/test/java/edu/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-internet2
-dir
-

diff --git a/src/test/java/edu/internet2/.svn/all-wcprops b/src/test/java/edu/internet2/.svn/all-wcprops
deleted file mode 100644
index d54a94d..0000000
--- a/src/test/java/edu/internet2/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java/edu/internet2
-END
diff --git a/src/test/java/edu/internet2/.svn/entries b/src/test/java/edu/internet2/.svn/entries
deleted file mode 100644
index 2accb5e..0000000
--- a/src/test/java/edu/internet2/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-middleware
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/.svn/all-wcprops
deleted file mode 100644
index d4c94db..0000000
--- a/src/test/java/edu/internet2/middleware/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java/edu/internet2/middleware
-END
diff --git a/src/test/java/edu/internet2/middleware/.svn/entries b/src/test/java/edu/internet2/middleware/.svn/entries
deleted file mode 100644
index 199fef1..0000000
--- a/src/test/java/edu/internet2/middleware/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-shibboleth
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/.svn/all-wcprops
deleted file mode 100644
index c8e3642..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/.svn/entries
deleted file mode 100644
index ac32976..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-common
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops
deleted file mode 100644
index 11dc7fb..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 103
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common
-END
-ShibTestBootstrap.java
-K 25
-svn:wc:ra_dav:version-url
-V 126
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/ShibTestBootstrap.java
-END
-TestCaseBase.java
-K 25
-svn:wc:ra_dav:version-url
-V 120
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/TestCaseBase.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/entries
deleted file mode 100644
index fb5914f..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/entries
+++ /dev/null
@@ -1,117 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-binding
-dir
-

-util
-dir
-

-attribute
-dir
-

-ShibTestBootstrap.java
-file
-
-
-
-
-2014-02-19T17:27:39.862721Z
-8482ff77c76694e84982346bdbd4b70c
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1478
-

-config
-dir
-

-TestCaseBase.java
-file
-
-
-
-
-2014-02-19T17:27:39.862721Z
-8c8b435a7987d953a433cf2d4b73c40f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5790
-

-resource
-dir
-

-security
-dir
-

-xmlobject
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibTestBootstrap.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibTestBootstrap.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/ShibTestBootstrap.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/TestCaseBase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/TestCaseBase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/prop-base/TestCaseBase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibTestBootstrap.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibTestBootstrap.java.svn-base
deleted file mode 100644
index 515413e..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/ShibTestBootstrap.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common;
-
-import org.opensaml.DefaultBootstrap;
-import org.opensaml.xml.ConfigurationException;
-
-/**
- * Extension to the SAML test bootstrap process which sets up configuration for testing purposes.
- */
-public class ShibTestBootstrap extends DefaultBootstrap {
-
-    /** List of XMLTooling configuration files with test configuration. */
-    private static String[] testConfigs = { "/shibboleth-saml-ext-config.xml", };
-
-    public static synchronized void bootstrap() throws ConfigurationException {
-        DefaultBootstrap.bootstrap();
-
-        initializeXMLTooling(testConfigs);
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/TestCaseBase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/TestCaseBase.java.svn-base
deleted file mode 100644
index 7455c33..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/.svn/text-base/TestCaseBase.java.svn-base
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common;
-
-import org.custommonkey.xmlunit.XMLTestCase;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.opensaml.Configuration;
-import org.opensaml.xml.ConfigurationException;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilderFactory;
-import org.opensaml.xml.io.Marshaller;
-import org.opensaml.xml.io.MarshallerFactory;
-import org.opensaml.xml.io.Unmarshaller;
-import org.opensaml.xml.io.UnmarshallerFactory;
-import org.opensaml.xml.io.UnmarshallingException;
-import org.opensaml.xml.parse.BasicParserPool;
-import org.opensaml.xml.parse.XMLParserException;
-import org.opensaml.xml.util.XMLHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Base class for JUnit test cases.
- */
-public abstract class TestCaseBase extends XMLTestCase {
-
-    /** Base path for data files. */
-    public static final String DATA_PATH = "/data/edu/internet2/middleware/shibboleth/common";
-
-    /** Parser manager used to parse XML. */
-    protected static BasicParserPool parser;
-
-    /** XMLObject builder factory. */
-    protected static XMLObjectBuilderFactory builderFactory;
-
-    /** XMLObject marshaller factory. */
-    protected static MarshallerFactory marshallerFactory;
-
-    /** XMLObject unmarshaller factory. */
-    protected static UnmarshallerFactory unmarshallerFactory;
-
-    /** Class logger. */
-    private static Logger log = LoggerFactory.getLogger(TestCaseBase.class);
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        XMLUnit.setIgnoreWhitespace(true);
-
-        try {
-            ShibTestBootstrap.bootstrap();
-        } catch (ConfigurationException e) {
-            fail(e.getMessage());
-        }
-
-        parser = new BasicParserPool();
-        parser.setNamespaceAware(true);
-        builderFactory = Configuration.getBuilderFactory();
-        marshallerFactory = Configuration.getMarshallerFactory();
-        unmarshallerFactory = Configuration.getUnmarshallerFactory();
-    }
-
-    /**
-     * Asserts a given XMLObject is equal to an expected DOM. The XMLObject is marshalled and the resulting DOM object
-     * is compared against the expected DOM object for equality.
-     * 
-     * @param expectedDOM the expected DOM
-     * @param xmlObject the XMLObject to be marshalled and compared against the expected DOM
-     */
-    public void assertEquals(Document expectedDOM, XMLObject xmlObject) {
-        assertEquals("Marshalled DOM was not the same as the expected DOM", expectedDOM, xmlObject);
-    }
-
-    /**
-     * Asserts a given XMLObject is equal to an expected DOM. The XMLObject is marshalled and the resulting DOM object
-     * is compared against the expected DOM object for equality.
-     * 
-     * @param failMessage the message to display if the DOMs are not equal
-     * @param expectedDOM the expected DOM
-     * @param xmlObject the XMLObject to be marshalled and compared against the expected DOM
-     */
-    public void assertEquals(String failMessage, Document expectedDOM, XMLObject xmlObject) {
-        Marshaller marshaller = marshallerFactory.getMarshaller(xmlObject);
-        if (marshaller == null) {
-            fail("Unable to locate marshaller for " + xmlObject.getElementQName()
-                    + " can not perform equality check assertion");
-        }
-
-        try {
-            Element generatedDOM = marshaller.marshall(xmlObject, parser.newDocument());
-            if (log.isDebugEnabled()) {
-                log.debug("Marshalled DOM was " + XMLHelper.nodeToString(generatedDOM));
-            }
-            assertXMLEqual(failMessage, expectedDOM, generatedDOM.getOwnerDocument());
-        } catch (Exception e) {
-            log.error("Marshalling failed with the following error:", e);
-            fail("Marshalling failed with the following error: " + e);
-        }
-    }
-
-    /**
-     * Unmarshalls an element file into its SAMLObject.
-     * 
-     * @param elementFile the classpath path to an XML document to unmarshall
-     * 
-     * @return the SAMLObject from the file
-     */
-    protected XMLObject unmarshallElement(String elementFile) {
-        try {
-            Document doc = parser.parse(TestCaseBase.class.getResourceAsStream(elementFile));
-            Element samlElement = doc.getDocumentElement();
-
-            Unmarshaller unmarshaller = Configuration.getUnmarshallerFactory().getUnmarshaller(samlElement);
-            if (unmarshaller == null) {
-                fail("Unable to retrieve unmarshaller by DOM Element");
-            }
-
-            return unmarshaller.unmarshall(samlElement);
-        } catch (XMLParserException e) {
-            fail("Unable to parse element file " + elementFile);
-        } catch (UnmarshallingException e) {
-            fail("Unmarshalling failed when parsing element file " + elementFile + ": " + e);
-        }
-
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops
deleted file mode 100644
index 64a4730..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 113
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries
deleted file mode 100644
index 6201a6c..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries
+++ /dev/null
@@ -1,34 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-resolver
-dir
-

-filtering
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops
deleted file mode 100644
index ba66213..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 123
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries
deleted file mode 100644
index 91ea2b1..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-provider
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops
deleted file mode 100644
index 5ab72d0..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 132
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider
-END
-ShibbolethAttributeFilteringEngineTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 175
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/ShibbolethAttributeFilteringEngineTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries
deleted file mode 100644
index afc1107..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries
+++ /dev/null
@@ -1,65 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibbolethAttributeFilteringEngineTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.594716Z
-5d0b02498397abbc82ee9d8eb883db4e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10990
-

-match
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethAttributeFilteringEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethAttributeFilteringEngineTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/prop-base/ShibbolethAttributeFilteringEngineTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethAttributeFilteringEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethAttributeFilteringEngineTest.java.svn-base
deleted file mode 100644
index 2860eb7..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/text-base/ShibbolethAttributeFilteringEngineTest.java.svn-base
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AnyMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.AttributeValueStringMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic.OrMatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-
-/** Unit test for {@link ShibbolethAttributeFilteringEngine}. */
-public class ShibbolethAttributeFilteringEngineTest extends TestCase {
-
-    private Map<String, BaseAttribute> attributes;
-
-    private BaseSAMLProfileRequestContext requestContext;
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        BasicAttribute<String> eduPersonAffiliation = new BasicAttribute<String>();
-        eduPersonAffiliation.setId("eduPersonAffiliation");
-        eduPersonAffiliation.getValues().add("staff");
-        eduPersonAffiliation.getValues().add("employee");
-        eduPersonAffiliation.getValues().add("part-time-student");
-        eduPersonAffiliation.getValues().add("part-time-staff");
-
-        BasicAttribute<ScopedAttributeValue> eduPersonScopedAffiliation = new BasicAttribute<ScopedAttributeValue>();
-        eduPersonScopedAffiliation.setId("eduPersonScopedAffiliation");
-        eduPersonScopedAffiliation.getValues().add(new ScopedAttributeValue("staff", "example.org"));
-        eduPersonScopedAffiliation.getValues().add(new ScopedAttributeValue("employee", "example.org"));
-        eduPersonScopedAffiliation.getValues().add(new ScopedAttributeValue("part-time-staff", "example.org"));
-        eduPersonScopedAffiliation.getValues().add(new ScopedAttributeValue("part-time-student", "example.org"));
-
-        attributes = new HashMap<String, BaseAttribute>();
-        attributes.put(eduPersonAffiliation.getId(), eduPersonAffiliation);
-        attributes.put(eduPersonScopedAffiliation.getId(), eduPersonScopedAffiliation);
-
-        requestContext = new BaseSAMLProfileRequestContext();
-        requestContext.setPrincipalName("jsmith");
-    }
-
-    /** Tests filtering based on a single simple policy. */
-    public void testBasicFilterPolicy() throws Exception {
-        // Set up the policy for this test
-        AttributeValueStringMatchFunctor staffRule = new AttributeValueStringMatchFunctor();
-        staffRule.setMatchString("staff");
-
-        AttributeValueStringMatchFunctor employeeRule = new AttributeValueStringMatchFunctor();
-        employeeRule.setMatchString("employee");
-
-        ArrayList<MatchFunctor> allowedValues = new ArrayList<MatchFunctor>();
-        allowedValues.add(staffRule);
-        allowedValues.add(employeeRule);
-        MatchFunctor allowedAffiliationValues = new OrMatchFunctor(allowedValues);
-
-        AttributeRule ePARule = new AttributeRule("eduPersonAffiliation");
-        ePARule.setPermitValueRule(allowedAffiliationValues);
-
-        AttributeRule ePSARule = new AttributeRule("eduPersonScopedAffiliation");
-        ePSARule.setPermitValueRule(allowedAffiliationValues);
-
-        AttributeFilterPolicy afp = new AttributeFilterPolicy("afptest");
-        afp.setPolicyRequirementRule(new AnyMatchFunctor());
-        afp.getAttributeRules().add(ePARule);
-        afp.getAttributeRules().add(ePSARule);
-
-        // Now run the actual test
-        ShibbolethAttributeFilteringEngine filterEngine = new ShibbolethAttributeFilteringEngine();
-        filterEngine.getFilterPolicies().add(afp);
-
-        Map<String, BaseAttribute> filteredAttributes = filterEngine.filterAttributes(attributes, requestContext);
-
-        BaseAttribute eduPersonAffiliation = filteredAttributes.get("eduPersonAffiliation");
-        assertNotNull(eduPersonAffiliation);
-        assertEquals(2, eduPersonAffiliation.getValues().size());
-        assertTrue(eduPersonAffiliation.getValues().contains("staff"));
-        assertTrue(eduPersonAffiliation.getValues().contains("employee"));
-
-        BaseAttribute eduPersonScopedAffiliation = filteredAttributes.get("eduPersonAffiliation");
-        assertNotNull(eduPersonScopedAffiliation);
-        assertEquals(2, eduPersonScopedAffiliation.getValues().size());
-        assertTrue(eduPersonScopedAffiliation.getValues().contains("staff"));
-        assertTrue(eduPersonScopedAffiliation.getValues().contains("employee"));
-    }
-
-    /** Tests filtering based on a two policy, each of which releases one a value for each of the test attributes. */
-    public void testMultiplePolicies() throws Exception {
-        // Set up the policy for this test
-        AttributeValueStringMatchFunctor staffAllow = new AttributeValueStringMatchFunctor();
-        staffAllow.setMatchString("staff");
-
-        AttributeValueStringMatchFunctor employeeAllow = new AttributeValueStringMatchFunctor();
-        employeeAllow.setMatchString("employee");
-
-        // First policy
-        AttributeFilterPolicy afp1 = new AttributeFilterPolicy("afp1");
-        afp1.setPolicyRequirementRule(new AnyMatchFunctor());
-        AttributeRule ePARule1 = new AttributeRule("eduPersonAffiliation");
-        ePARule1.setPermitValueRule(staffAllow);
-        afp1.getAttributeRules().add(ePARule1);
-        AttributeRule ePSARule1 = new AttributeRule("eduPersonScopedAffiliation");
-        ePSARule1.setPermitValueRule(staffAllow);
-        afp1.getAttributeRules().add(ePSARule1);
-
-        // Second policy
-        AttributeFilterPolicy afp2 = new AttributeFilterPolicy("afp2");
-        afp2.setPolicyRequirementRule(new AnyMatchFunctor());
-        AttributeRule ePARule2 = new AttributeRule("eduPersonAffiliation");
-        ePARule2.setPermitValueRule(employeeAllow);
-        afp2.getAttributeRules().add(ePARule2);
-        AttributeRule ePSARule2 = new AttributeRule("eduPersonScopedAffiliation");
-        ePSARule2.setPermitValueRule(employeeAllow);
-        afp2.getAttributeRules().add(ePSARule2);
-
-        // Now run the actual test
-        ShibbolethAttributeFilteringEngine filterEngine = new ShibbolethAttributeFilteringEngine();
-        filterEngine.getFilterPolicies().add(afp1);
-        filterEngine.getFilterPolicies().add(afp2);
-
-        Map<String, BaseAttribute> filteredAttributes = filterEngine.filterAttributes(attributes, requestContext);
-
-        BaseAttribute eduPersonAffiliation = filteredAttributes.get("eduPersonAffiliation");
-        assertNotNull(eduPersonAffiliation);
-        assertEquals(2, eduPersonAffiliation.getValues().size());
-        assertTrue(eduPersonAffiliation.getValues().contains("staff"));
-        assertTrue(eduPersonAffiliation.getValues().contains("employee"));
-
-        BaseAttribute eduPersonScopedAffiliation = filteredAttributes.get("eduPersonAffiliation");
-        assertNotNull(eduPersonScopedAffiliation);
-        assertEquals(2, eduPersonScopedAffiliation.getValues().size());
-        assertTrue(eduPersonScopedAffiliation.getValues().contains("staff"));
-        assertTrue(eduPersonScopedAffiliation.getValues().contains("employee"));
-    }
-
-    /** Test running a policy with a deny value rule. */
-    public void testDenyRules() throws Exception {
-        // Set up the policy for this test
-        AttributeValueStringMatchFunctor staffAllow = new AttributeValueStringMatchFunctor();
-        staffAllow.setMatchString("staff");
-
-        AttributeValueStringMatchFunctor employeeAllow = new AttributeValueStringMatchFunctor();
-        employeeAllow.setMatchString("employee");
-
-        ArrayList<MatchFunctor> allowedValues = new ArrayList<MatchFunctor>();
-        allowedValues.add(staffAllow);
-        allowedValues.add(employeeAllow);
-        MatchFunctor allowedAffiliationValues = new OrMatchFunctor(allowedValues);
-
-        // First policy
-        AttributeFilterPolicy afp1 = new AttributeFilterPolicy("afp1");
-        afp1.setPolicyRequirementRule(new AnyMatchFunctor());
-        AttributeRule ePARule1 = new AttributeRule("eduPersonAffiliation");
-        ePARule1.setPermitValueRule(allowedAffiliationValues);
-        afp1.getAttributeRules().add(ePARule1);
-        AttributeRule ePSARule1 = new AttributeRule("eduPersonScopedAffiliation");
-        ePSARule1.setPermitValueRule(allowedAffiliationValues);
-        afp1.getAttributeRules().add(ePSARule1);
-
-        // Second policy
-        AttributeFilterPolicy afp2 = new AttributeFilterPolicy("afp2");
-        afp2.setPolicyRequirementRule(new AnyMatchFunctor());
-        AttributeRule ePARule2 = new AttributeRule("eduPersonAffiliation");
-        ePARule2.setDenyValueRule(employeeAllow);
-        afp2.getAttributeRules().add(ePARule2);
-        AttributeRule ePSARule2 = new AttributeRule("eduPersonScopedAffiliation");
-        ePSARule2.setDenyValueRule(employeeAllow);
-        afp2.getAttributeRules().add(ePSARule2);
-
-        // Now run the actual test
-        ShibbolethAttributeFilteringEngine filterEngine = new ShibbolethAttributeFilteringEngine();
-        filterEngine.getFilterPolicies().add(afp1);
-        filterEngine.getFilterPolicies().add(afp2);
-
-        Map<String, BaseAttribute> filteredAttributes = filterEngine.filterAttributes(attributes, requestContext);
-
-        BaseAttribute eduPersonAffiliation = filteredAttributes.get("eduPersonAffiliation");
-        assertNotNull(eduPersonAffiliation);
-        assertEquals(1, eduPersonAffiliation.getValues().size());
-        assertTrue(eduPersonAffiliation.getValues().contains("staff"));
-
-        BaseAttribute eduPersonScopedAffiliation = filteredAttributes.get("eduPersonAffiliation");
-        assertNotNull(eduPersonScopedAffiliation);
-        assertEquals(1, eduPersonScopedAffiliation.getValues().size());
-        assertTrue(eduPersonScopedAffiliation.getValues().contains("staff"));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops
deleted file mode 100644
index 62f77fd..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 138
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match
-END
-BaseTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/1037/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/BaseTestCase.java
-END
-BaseTestCaseMetadata.java
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/1046/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/BaseTestCaseMetadata.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries
deleted file mode 100644
index 44fd9b9..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries
+++ /dev/null
@@ -1,102 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-saml
-dir
-

-basic
-dir
-

-BaseTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.590716Z
-38922f204d7a404377c048234c88bc55
-2012-11-06T14:26:35.466331Z
-1037
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5898
-

-BaseTestCaseMetadata.java
-file
-
-
-
-
-2014-02-19T17:27:39.594716Z
-0fd40331248bc166f5bfd7e8b3a326be
-2012-11-28T01:11:33.236619Z
-1046
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5227
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/prop-base/BaseTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/prop-base/BaseTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/prop-base/BaseTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/prop-base/BaseTestCaseMetadata.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/prop-base/BaseTestCaseMetadata.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/prop-base/BaseTestCaseMetadata.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/text-base/BaseTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/text-base/BaseTestCase.java.svn-base
deleted file mode 100644
index eff1c21..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/text-base/BaseTestCase.java.svn-base
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-
-/**
- * Base class for JUnit test cases.
- */
-public class BaseTestCase extends TestCase {
-
-    /** Base path for data files. */
-    public static final String DATA_PATH = 
-         "/test/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic";
-    
-
-    /**
-     * Simple filtering context for use by tests.
-     */
-    protected ShibbolethFilteringContext filterContext;
-    
-    /**
-     * A simple attribute included in filterContext. 
-     */
-    protected BaseAttribute<Integer> iAttribute;
-    /**
-     * A simple attribute included in filterContext. 
-     */
-    protected BaseAttribute<String> sAttribute;
-    
-    /**
-     * A Scoped attributed included in filter context.
-     */
-    protected BasicAttribute<ScopedAttributeValue> scope;
-    
-    /**
-     * Request Context included in filter context.
-     */
-    protected BaseSAMLProfileRequestContext requestContext; 
-
-    /**
-     * The Functor under test. 
-     */
-    protected MatchFunctor matchFunctor; 
-    
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-        //
-        // Set up the two simple Attributes and then put them into our
-        // filtering context
-        //
-        
-        BasicAttribute<Integer> ia = new BasicAttribute<Integer>("IntegerAttr");
-        ArrayList<Integer> iList = new ArrayList<Integer>();
-        iList.add(new Integer(1));
-        iList.add(new Integer(2));
-        iList.add(new Integer(3));
-        ia.setValues(iList);
-        iAttribute = ia;
-        
-        BasicAttribute<String> sa = new BasicAttribute<String>("StringAttr");
-        sAttribute = sa;
-        ArrayList<String> sList = new ArrayList<String>();
-        sList.add("one");
-        sa.setValues(sList);
-
-        scope = new BasicAttribute<ScopedAttributeValue>("Scope");
-        ArrayList<ScopedAttributeValue> list = new ArrayList<ScopedAttributeValue>();
-        list.add(new ScopedAttributeValue("ScopedValue","ScopedScope"));
-        scope.setValues(list);
-
-        
-        Map<String,BaseAttribute> map = new HashMap<String, BaseAttribute>(5);
-        map.put(sAttribute.getId(), sAttribute);
-        map.put(iAttribute.getId(), iAttribute);
-        map.put(scope.getId(), scope);
-        
-        requestContext = new BaseSAMLProfileRequestContext();
-        
-        filterContext = new ShibbolethFilteringContext(map, requestContext);   
-}
-    
-     
-    /**
-     * Test for the expected result with the given function, (both PermitValue and PolicyRequirement).
-     * Thuis method is particularly useful for the boolean cases.
-     * 
-     * @param testName the error message to extrude
-     * @param functor what to test
-     * @param expectedResult whether we expect the test to succeed for fail
-     */
-    protected void testBoth(String testName, MatchFunctor functor, boolean expectedResult) {
-        try {
-            if (expectedResult) {
-                assertTrue(testName + " (permitValue)", 
-                           functor.evaluatePermitValue(filterContext, 
-                           iAttribute.getId(), null)); 
-                assertTrue(testName + " (policyRequirement)", 
-                           functor.evaluatePolicyRequirement(filterContext)); 
-            } else {
-                assertFalse(testName + " (permitValue)", 
-                            functor.evaluatePermitValue(filterContext, 
-                            iAttribute.getId(), null)); 
-                assertFalse(testName + " (policyRequirement)", functor.evaluatePolicyRequirement(filterContext));
-            }
-        } catch (FilterProcessingException e) {
-           fail(testName + " threw " + e.getLocalizedMessage());
-        }
-    }
-    
-    /**
-     * 
-     * Test for the expected result with base clase functor, (both PermitValue and PolicyRequirement).
-     * @param testName error string to exit
-     * @param expectedResult whether we expect to pass or fail.
-     */
-    protected void testBoth(String testName, boolean expectedResult) {
-        testBoth(testName, matchFunctor, expectedResult);
-    }
-    
-    /**
-     * placeholder to allow us to test an entire folder. 
-     */
-    public void testBase() {
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/text-base/BaseTestCaseMetadata.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/text-base/BaseTestCaseMetadata.java.svn-base
deleted file mode 100644
index a77ca15..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/text-base/BaseTestCaseMetadata.java.svn-base
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match;
-
-import java.io.File;
-import java.net.URL;
-import java.util.TreeMap;
-
-import junit.framework.TestCase;
-
-import org.opensaml.DefaultBootstrap;
-import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
-import org.opensaml.xml.ConfigurationException;
-import org.opensaml.xml.parse.BasicParserPool;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethFilteringContext;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-
-/**
- * Base class for JUnit test cases.
- */
-public class BaseTestCaseMetadata extends TestCase {
-
-    /** Base path for data files. */
-    public static final String DATA_PATH = "/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic";
-
-    /** Base path to metadata files. */
-    public static final String MD_PATH = "/data/edu/internet2/middleware/shibboleth/common/config/metadata";
-
-    /** The metadata file that will be used during this test. */
-    protected String metadataFile = MD_PATH + "/Metadata1.xml";
-
-    /** EntityID of the message issuer. */
-    protected String issuerEntityId = "urn:exmaple.org:issuer";
-
-    /** EntityID of the message requester. */
-    protected String requesterEntityId = "urn:exmaple.org:requester";
-
-    /** Parser for metadata. */
-    protected BasicParserPool parser;
-
-    /** Provider loaded with metadata. */
-    protected FilesystemMetadataProvider metadataProvider;
-
-    /** Request Context included in filter context. */
-    protected BaseSAMLProfileRequestContext requestContext;
-
-    /** Simple filtering context for use by tests. */
-    protected ShibbolethFilteringContext filterContext;
-
-    /** A simple attribute included in filterContext. */
-    protected BaseAttribute<Integer> iAttribute;
-
-    /** A simple attribute included in filterContext. */
-    protected BaseAttribute<String> sAttribute;
-
-    /** The Functor under test. */
-    protected MatchFunctor matchFunctor;
-
-    /**
-     * Constructor.
-     */
-    public BaseTestCaseMetadata() {
-        //
-        // initialize SAML in here - it's a bit costly to do it for every test.
-        //
-
-        try {
-            DefaultBootstrap.bootstrap();
-        } catch (ConfigurationException e) {
-            fail(e.getMessage());
-        }
-
-        parser = new BasicParserPool();
-        parser.setNamespaceAware(true);
-    }
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        //
-        // We load the test data from the class path
-        //
-
-        URL mdURL = BaseTestCase.class.getResource(metadataFile);
-        File mdFile = new File(mdURL.toURI());
-
-        //
-        // Summon up something to read the metadata
-        //
-
-        metadataProvider = new FilesystemMetadataProvider(mdFile);
-        metadataProvider.setParserPool(parser);
-        metadataProvider.initialize();
-
-        //
-        // Create a simple configuration
-        //
-
-        RelyingPartyConfiguration rpConfig = new RelyingPartyConfiguration(requesterEntityId, issuerEntityId);
-
-        //
-        // Build the request context from the metadata (with attached parser) and config
-        //
-
-        requestContext = new BaseSAMLProfileRequestContext();
-        requestContext.setMetadataProvider(metadataProvider);
-        requestContext.setRelyingPartyConfiguration(rpConfig);
-        requestContext.setOutboundMessageIssuer(issuerEntityId);
-        requestContext.setLocalEntityMetadata(metadataProvider.getEntityDescriptor(issuerEntityId));
-        requestContext.setInboundMessageIssuer(requesterEntityId);
-        requestContext.setPeerEntityMetadata(metadataProvider.getEntityDescriptor(requesterEntityId));
-
-        //
-        // And the filter context from the request context (with no attributes)
-        //
-
-        filterContext = new ShibbolethFilteringContext(new TreeMap<String, BaseAttribute>(), requestContext);
-
-    }
-
-    /** Placeholder to allow us to test an entire folder. */
-    public void testBase() {
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops
deleted file mode 100644
index ce230b9..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops
+++ /dev/null
@@ -1,113 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 144
-/java-shib-common/!svn/ver/1038/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic
-END
-AttributeValueStringMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeValueStringMatchFunctorTest.java
-END
-AnyMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AnyMatchFunctorTest.java
-END
-AttributeScopeRegexMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeScopeRegexMatchFunctorTest.java
-END
-AttributeIssuerRegexMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeIssuerRegexMatchFunctorTest.java
-END
-AttributeRequesterStringMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 189
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeRequesterStringMatchFunctorTest.java
-END
-AttributeValueRegexMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeValueRegexMatchFunctorTest.java
-END
-AttributeRequesterRegexMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 188
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeRequesterRegexMatchFunctorTest.java
-END
-NotMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/NotMatchFunctorTest.java
-END
-AndMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AndMatchFunctorTest.java
-END
-NumAttributeValuesMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 184
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/NumAttributeValuesMatchFunctorTest.java
-END
-ScriptMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 172
-/java-shib-common/!svn/ver/1038/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/ScriptMatchFunctorTest.java
-END
-AuthenticationMethodStringMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 192
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AuthenticationMethodStringMatchFunctorTest.java
-END
-PrincipalStringMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 181
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/PrincipalStringMatchFunctorTest.java
-END
-AuthenticationMethodRegexMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 191
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AuthenticationMethodRegexMatchFunctorTest.java
-END
-PrincipalRegexMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 180
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/PrincipalRegexMatchFunctorTest.java
-END
-OrMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/OrMatchFunctorTest.java
-END
-AttributeScopeStringMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeScopeStringMatchFunctorTest.java
-END
-AttributeIssuerStringMatchFunctorTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 186
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/AttributeIssuerStringMatchFunctorTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries
deleted file mode 100644
index 0936323..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries
+++ /dev/null
@@ -1,640 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-11-06T14:48:41.274125Z
-1038
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeScopeStringMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-0fc6a12231ff9f02160a9628ab3f02c7
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3352
-

-AttributeIssuerStringMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-8a9d375e77971e2f7e17998cbc90c92c
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3187
-

-AttributeValueStringMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-236bdee5e6c8915ab11d8c0923334ddc
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3318
-

-AnyMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-8f70b60f55a6e0d549a7d39029df7baa
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1944
-

-AttributeScopeRegexMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-7d6a2012c413e520ad3dbf065b7babf1
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3357
-

-AttributeIssuerRegexMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-360c3ef7ef08735747235c97ff145f81
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1803
-

-AttributeRequesterStringMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-5600192dcde5ba28a4dc38dc3f53e19d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3241
-

-AttributeValueRegexMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-ca107014430f16b4aec6535cc98533fc
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3265
-

-AttributeRequesterRegexMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-cd197119e7edf9fff6ed5b1a088ca487
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1803
-

-NotMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.398712Z
-2f6b847b5744df1d6fa05a0654000441
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1436
-

-AndMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-ab2675c96760e5711c6eba8a05dd5385
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2753
-

-NumAttributeValuesMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-8b4438ac04924392a477c8f3d1cd7d36
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2416
-

-ScriptMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-6a0d9f17bc37f0c3200dc8a09321f523
-2012-11-06T14:48:41.274125Z
-1038
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3548
-

-AuthenticationMethodStringMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-3e2df54b53f17254e694be8f23b37338
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2895
-

-PrincipalStringMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-35523791ce85b537684ede2e6a8ab505
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2741
-

-AuthenticationMethodRegexMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-b28cd35b80567c1565d837a4205cb342
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2900
-

-PrincipalRegexMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-3df89e8a5e111a42d21cf744f4909afa
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3095
-

-OrMatchFunctorTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.402712Z
-04643e4f60f711215106e9c68ce410fd
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2638
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AndMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AndMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AndMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AnyMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AnyMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AnyMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeIssuerStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeRequesterStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeScopeStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AttributeValueStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/AuthenticationMethodStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NotMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NotMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NotMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NumAttributeValuesMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NumAttributeValuesMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/NumAttributeValuesMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/OrMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/OrMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/OrMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/PrincipalStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/ScriptMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/ScriptMatchFunctorTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/ScriptMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AndMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AndMatchFunctorTest.java.svn-base
deleted file mode 100644
index 35394ae..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AndMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import java.util.ArrayList;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link AndMatchFunctor} unit test. */
-public class AndMatchFunctorTest extends BaseTestCase {
-
-    /**
-     *  Conatins the list of functors we continaully test.
-     */
-    private ArrayList<MatchFunctor> functors = new ArrayList<MatchFunctor>(3);
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        matchFunctor = new AndMatchFunctor(functors);
-    }
-    
-    /**
-     * Test several possible configurations of and.
-     */
-    public void testAndFunction() {
-        
-        testBoth("null", new AndMatchFunctor(null), false);
-        
-        functors.clear();
-        testBoth("Empty", false);
-        
-        //
-        // And (TRUE)
-        //
-        functors.add(new AnyMatchFunctor());           
-        testBoth("(TRUE)", true);
-        
-        //
-        // And (TRUE, TRUE);
-        //
-        functors.add(new AnyMatchFunctor());           
-        testBoth("(TRUE, TRUE)", true);
-        
-        //
-        // And (TRUE, TRUE, TRUE);
-        //
-        functors.add(new AnyMatchFunctor());           
-        testBoth("(TRUE, TRUE, TRUE)", true);
-
-        //
-        // And (TRUE, FALSE, TRUE);
-        //
-        functors.set(1, new NotMatchFunctor(new AnyMatchFunctor()));           
-        testBoth("(TRUE, FALSE, TRUE)", false);
-
-        //
-        // And (TRUE, FALSE);
-        //
-        functors.remove(2);           
-        testBoth("(TRUE, FALSE)", false);
-        
-        //
-        // And (FALSE)
-        //
-        functors.remove(0);           
-        testBoth("(FALSE)", false);
-            
-    }
-
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AnyMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AnyMatchFunctorTest.java.svn-base
deleted file mode 100644
index 734845d..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AnyMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/**  test the {@link AnyMatchFunctor}. */
-public class AnyMatchFunctorTest extends BaseTestCase {
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        matchFunctor = new AnyMatchFunctor();
-    }
-    
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", matchFunctor.evaluatePermitValue(filterContext, iAttribute.getId(), null));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        try {
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index 1927f4d..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeIssuerRegexMatchFunctor} unit test. */
-public class AttributeIssuerRegexMatchFunctorTest extends BaseTestCaseMetadata {
-
-    /** Test against the issuer name ("urn:exmaple.org:issuer") in the metadata. */
-    public void testIssuerRegexp() throws Exception {
-        AttributeIssuerRegexMatchFunctor functor = new AttributeIssuerRegexMatchFunctor();
-        functor.setRegularExpression("[uU].*[iI]ssuer");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerRegexMatchFunctor();
-        functor.setRegularExpression(".*a");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index 40c042f..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeIssuerStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeIssuerStringMatchFunctor} unit test. */
-public class AttributeIssuerStringMatchFunctorTest extends BaseTestCaseMetadata {
-
-    /** Test against the issuer name ("urn:exmaple.org:issuer") in the metadata. */
-    public void testCaseSensitive() throws Exception {
-        AttributeIssuerStringMatchFunctor functor = new AttributeIssuerStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:issuer");
-        functor.setCaseSensitive(true);
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:Issuer");
-        functor.setCaseSensitive(true);
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    /** Test against almost the issuer name in the metadata. */
-    public void testCaseInsensitive() throws Exception {
-        AttributeIssuerStringMatchFunctor functor = new AttributeIssuerStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:issuer");
-        functor.setCaseSensitive(false);
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:Issuer");
-        functor.setCaseSensitive(false);
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    /** Test against nothing like the issuer name in the metadata. */
-    public void testMismatch() throws Exception {
-        AttributeIssuerStringMatchFunctor functor = new AttributeIssuerStringMatchFunctor();
-        functor.setMatchString("foo");
-        functor.setCaseSensitive(true);
-
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index cc11344..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeRequesterRegexMatchFunctor} unit test. */
-public class AttributeRequesterRegexMatchFunctorTest extends BaseTestCaseMetadata {
-
-    /** Test against the issuer name ("Rely") in the metadata. */
-    public void testIssuerRegexp() throws Exception {
-        AttributeRequesterRegexMatchFunctor functor = new AttributeRequesterRegexMatchFunctor();
-        functor.setRegularExpression("[uU].*[rR]equester");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterRegexMatchFunctor();
-        functor.setRegularExpression(".*a");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index af525ea..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeRequesterStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeRequesterStringMatchFunctor} unit test. */
-public class AttributeRequesterStringMatchFunctorTest extends BaseTestCaseMetadata {
-
-    /** Test against the requester name ("urn:exmaple.org:requester") in the metadata. */
-    public void testCaseSensitive() throws Exception {
-        AttributeRequesterStringMatchFunctor functor = new AttributeRequesterStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:requester");
-        functor.setCaseSensitive(true);
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:Requester");
-        functor.setCaseSensitive(true);
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    /** Test against almost the requester name in the metadata. */
-    public void testCaseInsensitive() throws Exception {
-        AttributeRequesterStringMatchFunctor functor = new AttributeRequesterStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:requester");
-        functor.setCaseSensitive(false);
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterStringMatchFunctor();
-        functor.setMatchString("urn:exmaple.org:Requester");
-        functor.setCaseSensitive(false);
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    /** Test against nothing like the requester name in the metadata. */
-    public void testMismatch() throws Exception {
-        AttributeRequesterStringMatchFunctor functor = new AttributeRequesterStringMatchFunctor();
-        functor.setMatchString("foo");
-        functor.setCaseSensitive(true);
-
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index 40a712d..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-
-/** {@link AttributeScopeRegexMatchFunctor} unit test. */
-public class AttributeScopeRegexMatchFunctorTest extends BaseTestCase {
-
-    
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        AttributeScopeRegexMatchFunctor functor = new AttributeScopeRegexMatchFunctor();
-        matchFunctor = functor;
-        functor.setAttributeId("Scope");
-        functor.setRegularExpression("Sc.*p[Ee]");
-       
-    }
-    
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, 
-                                                         null, 
-                                                         new ScopedAttributeValue("ScopedValue", "ScopedScope")));
-            assertFalse("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, 
-                                                         null,
-                                                         new ScopedAttributeValue("ScopedValue", "otherScope")));
-
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        AttributeScopeRegexMatchFunctor functor = (AttributeScopeRegexMatchFunctor) matchFunctor;
-        try {
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setRegularExpression("S.*Value");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setAttributeId(sAttribute.getId());
-            functor.setRegularExpression("Sc.*p[Ee]");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setAttributeId("Scope");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index ccb765b..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeScopeStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.ScopedAttributeValue;
-
-/** {@link AttributeScopeStringMatchFunctor} unit test. */
-public class AttributeScopeStringMatchFunctorTest extends BaseTestCase {
-
-    
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        AttributeScopeStringMatchFunctor functor = new AttributeScopeStringMatchFunctor();
-        matchFunctor = functor;
-        functor.setAttributeId("Scope");
-        functor.setMatchString("ScopedScope");
-       
-    }
-    
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, 
-                                                         null, 
-                                                         new ScopedAttributeValue("ScopedValue", "ScopedScope")));
-            assertFalse("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, 
-                                                         null,
-                                                         new ScopedAttributeValue("ScopedValue", "otherScope")));
-
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        AttributeScopeStringMatchFunctor functor = (AttributeScopeStringMatchFunctor) matchFunctor;
-        try {
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setMatchString("ScopedValue");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setAttributeId(sAttribute.getId());
-            functor.setMatchString("ScopedScope");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setAttributeId("Scope");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index bf8ab4b..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link AttributeValueRegexMatchFunctor} unit test. */
-public class AttributeValueRegexMatchFunctorTest extends BaseTestCase {
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        AttributeValueRegexMatchFunctor functor = new AttributeValueRegexMatchFunctor();
-        matchFunctor = functor;
-        functor.setAttributeId(sAttribute.getId());
-        functor.setRegularExpression("o.e");
-    }
-    
-    /**
-     * Test that values to permit value test. 
-     */
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", matchFunctor.evaluatePermitValue(filterContext, null, "one"));
-            assertFalse("evaluatePermitValue", matchFunctor.evaluatePermitValue(filterContext, null, "two"));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    /**
-     * Test the policy.
-     */
-    public void testPolicyRequirement() {
-        try {
-            AttributeValueRegexMatchFunctor functor = (AttributeValueRegexMatchFunctor) matchFunctor;
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setRegularExpression("[tT].*e");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            sAttribute.getValues().add("two");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            sAttribute.getValues().add("three");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setAttributeId("ScopedValue");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setAttributeId("Scope");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            
-            
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index af549b4..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AttributeValueStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link AttributeValueStringMatchFunctor} unit test. */
-public class AttributeValueStringMatchFunctorTest extends BaseTestCase {
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        AttributeValueStringMatchFunctor functor = new AttributeValueStringMatchFunctor();
-        matchFunctor = functor;
-        functor.setAttributeId(sAttribute.getId());
-        functor.setMatchString(sAttribute.getValues().toArray(new String[] {})[0]);
-    }
-
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", matchFunctor.evaluatePermitValue(filterContext, null, "one"));
-            assertTrue("evaluatePermitValue", matchFunctor.evaluatePermitValue(filterContext, null, "ONE"));
-            ((AttributeValueStringMatchFunctor) matchFunctor).setCaseSensitive(true);
-            assertFalse("evaluatePermitValue", matchFunctor.evaluatePermitValue(filterContext, null, "ONE"));
-            assertFalse("evaluatePermitValue", matchFunctor.evaluatePermitValue(filterContext, null, "two"));
-        } catch (FilterProcessingException e) {
-            fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        try {
-            AttributeValueStringMatchFunctor functor = (AttributeValueStringMatchFunctor) matchFunctor;
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setMatchString("three");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            sAttribute.getValues().add("two");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            sAttribute.getValues().add("three");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            functor.setAttributeId("wibble");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-
-        } catch (FilterProcessingException e) {
-            fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index 1bfc34b..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link AuthenticationMethodRegexMatchFunctor} unit test. */
-public class AuthenticationMethodRegexMatchFunctorTest extends BaseTestCase {
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        AuthenticationMethodRegexMatchFunctor functor = new AuthenticationMethodRegexMatchFunctor();
-        matchFunctor = functor;
-        functor.setRegularExpression("B.*h");
-        requestContext.setPrincipalAuthenticationMethod("Blind Faith");
-    }
-    
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-            requestContext.setPrincipalAuthenticationMethod("Retinal Scan");
-            assertFalse("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        try {
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            requestContext.setPrincipalAuthenticationMethod("Retinal Scan");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            AuthenticationMethodRegexMatchFunctor functor = (AuthenticationMethodRegexMatchFunctor) matchFunctor;
-            functor.setRegularExpression("[rR]etinal [sS]can");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index 6fb5f7e..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/AuthenticationMethodStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link AuthenticationMethodStringMatchFunctor} unit test. */
-public class AuthenticationMethodStringMatchFunctorTest extends BaseTestCase {
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        AuthenticationMethodStringMatchFunctor functor = new AuthenticationMethodStringMatchFunctor();
-        matchFunctor = functor;
-        functor.setMatchString("Blind Faith");
-        requestContext.setPrincipalAuthenticationMethod("Blind Faith");
-    }
-    
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-            requestContext.setPrincipalAuthenticationMethod("Retinal Scan");
-            assertFalse("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        try {
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            requestContext.setPrincipalAuthenticationMethod("Retinal Scan");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            AuthenticationMethodStringMatchFunctor functor = (AuthenticationMethodStringMatchFunctor) matchFunctor;
-            functor.setMatchString("Retinal Scan");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NotMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NotMatchFunctorTest.java.svn-base
deleted file mode 100644
index 28dab36..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NotMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link NotMatchFunctor} unit test. */
-public class NotMatchFunctorTest extends BaseTestCase {
-
-    public void setUp() throws Exception {
-        super.setUp();
-        matchFunctor = new NotMatchFunctor(new AnyMatchFunctor());
-    }
-    
-    public void testNot() {
-        testBoth("Not for false", false);
-        testBoth("Not for true", new NotMatchFunctor(matchFunctor), true);
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NumAttributeValuesMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NumAttributeValuesMatchFunctorTest.java.svn-base
deleted file mode 100644
index 8ad77f5..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/NumAttributeValuesMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link NumOfAttributeValuesMatchFunctor} unit test. */
-public class NumAttributeValuesMatchFunctorTest extends BaseTestCase {
-
-    public void setUp() throws Exception {
-        super.setUp();
-        matchFunctor = null;
-    }
-    
-    public void testInRange() {
-        //
-        // In Base we set up "StringAttr" with 1 attribute and "IntAttr" with three.
-        //
-        testBoth("InRange (1: 0-4)", new NumOfAttributeValuesMatchFunctor("StringAttr", 0, 4), true);
-        testBoth("InRange (1: 1-1)", new NumOfAttributeValuesMatchFunctor("StringAttr", 1, 1), true);
-        testBoth("InRange (3: 3-4)", new NumOfAttributeValuesMatchFunctor("IntegerAttr", 3, 4), true);
-        testBoth("InRange (3: 1-3)", new NumOfAttributeValuesMatchFunctor("IntegerAttr", 1, 3), true);
-    }
-    
-    public void testOutOfRange() {
-        //
-        // In Base we set up "StringAttr" with 1 attribute and "IntAttr" with three.
-        //
-        testBoth("OutRange (1: 2-4)", new NumOfAttributeValuesMatchFunctor("StringAttr", 2, 4), false);
-        testBoth("OutRange (1: 0-0)", new NumOfAttributeValuesMatchFunctor("StringAttr", 0, 0), false);
-        testBoth("OutRange (3: 0-3)", new NumOfAttributeValuesMatchFunctor("IntegerAttr", 0, 2), false);
-        testBoth("OutRange (3: 9-77)", new NumOfAttributeValuesMatchFunctor("IntegerAttr", 9, 77), false);
-        
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/OrMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/OrMatchFunctorTest.java.svn-base
deleted file mode 100644
index 73ebf78..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/OrMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import java.util.ArrayList;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.MatchFunctor;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link OrMatchFunctor} unit test. */
-public class OrMatchFunctorTest extends BaseTestCase {
-
-    private ArrayList<MatchFunctor> functors = new ArrayList<MatchFunctor>(3);
-
-    public void setUp() throws Exception {
-        super.setUp();
-        matchFunctor = new OrMatchFunctor(functors);
-    }
-    
-    public void testOrFunction() {
-        functors.clear();
-        
-        //
-        // Or (TRUE)
-        //
-        functors.add(new AnyMatchFunctor());           
-        testBoth("(TRUE)", true);
-        
-        //
-        // Or(TRUE, TRUE);
-        //
-        functors.add(new AnyMatchFunctor());           
-        testBoth("(TRUE, TRUE)", true);
-        
-        //
-        // Or (TRUE, TRUE, TRUE);
-        //
-        functors.add(new AnyMatchFunctor());           
-        testBoth("(TRUE, TRUE, TRUE)", true);
-
-        //
-        // And (TRUE, TRUE, FALSE);
-        //
-        functors.set(2, new NotMatchFunctor(new AnyMatchFunctor()));           
-        testBoth("(TRUE, TRUE, FALSE)", true);
-
-        //
-        // Or (FALSE, FALSE, FALSE);
-        //
-        functors.set(0, new NotMatchFunctor(new AnyMatchFunctor()));           
-        functors.set(1, new NotMatchFunctor(new AnyMatchFunctor()));           
-        testBoth("(FALSE, FALSE, FALSE)", false);
-        
-        //
-        // Or (FALSE)
-        //
-        functors.remove(0);           
-        functors.remove(0);           
-        testBoth("(FALSE)", false);
-            
-    }
-
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalRegexMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalRegexMatchFunctorTest.java.svn-base
deleted file mode 100644
index 10fbe88..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalRegexMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link PrincipalRegexMatchFunctor} unit test. */
-public class PrincipalRegexMatchFunctorTest extends BaseTestCase {
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        PrincipalRegexMatchFunctor functor = new PrincipalRegexMatchFunctor();
-        matchFunctor = functor;
-        functor.setRegularExpression("[jJ].*");
-        requestContext.setPrincipalName("Jim");
-    }
-    
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-            requestContext.setPrincipalName("John");
-            assertTrue("evaluatePermitValue", 
-                    matchFunctor.evaluatePermitValue(filterContext, null, null));
-            requestContext.setPrincipalName(" Fred ");
-            assertFalse("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        try {
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            requestContext.setPrincipalName("John");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            requestContext.setPrincipalName("Fred");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            PrincipalRegexMatchFunctor functor = (PrincipalRegexMatchFunctor) matchFunctor;
-            functor.setRegularExpression("F.*d");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalStringMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalStringMatchFunctorTest.java.svn-base
deleted file mode 100644
index c553942..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/PrincipalStringMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link PrincipalStringMatchFunctor} unit test. */
-public class PrincipalStringMatchFunctorTest extends BaseTestCase {
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        PrincipalStringMatchFunctor functor = new PrincipalStringMatchFunctor();
-        matchFunctor = functor;
-        functor.setMatchString("Jim");
-        requestContext.setPrincipalName("Jim");
-    }
-    
-    public void testPermitValue() {
-        try {
-            assertTrue("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-            requestContext.setPrincipalName("John");
-            assertFalse("evaluatePermitValue", 
-                        matchFunctor.evaluatePermitValue(filterContext, null, null));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    public void testPolicyRequirement() {
-        try {
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            requestContext.setPrincipalName("John");
-            assertFalse("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            PrincipalStringMatchFunctor functor = (PrincipalStringMatchFunctor) matchFunctor;
-            functor.setMatchString("John");
-            assertTrue("evaluatePolicyRequirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/ScriptMatchFunctorTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/ScriptMatchFunctorTest.java.svn-base
deleted file mode 100644
index e28f658..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/ScriptMatchFunctorTest.java.svn-base
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.basic;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.FilterProcessingException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCase;
-
-/** {@link ScriptMatchFunctor} unit test. */
-public class ScriptMatchFunctorTest extends BaseTestCase {
-    
-    /**
-     * Simple test to check whether parameters are passed OK.
-     */
-    private static final String SCRIPT = 
-         "function Result(filterContext, attributeId, attributeValue) {" +
-         "  if (attributeId == null) return true;" +
-         "  if (attributeValue == null) return true;" +
-         "  return filterContext.getUnfilteredAttributes().get(attributeId).getValues().get(0).toString().equals(attributeValue);" +
-         " }" +
-         "Result(filterContext, attributeId, attributeValue); ";
-
-    /** {@inheritDoc} */
-    public void setUp() throws Exception {
-        super.setUp();
-        matchFunctor = new ScriptMatchFunctor("JavaScript", "true;");
-    }
-    
-    /**
-     * Test two one line tests.
-     */
-    public void testSimpleScript() {
-        try {
-            assertTrue("Simple Value", matchFunctor.evaluatePermitValue(filterContext, null, null));
-            assertTrue("Simple Requirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            matchFunctor = new ScriptMatchFunctor("JavaScript", "false;");
-            assertFalse("Simple Value", matchFunctor.evaluatePermitValue(null, null, null));
-            assertFalse("Simple Requirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-
-    /**
-     * Test the complex script above (which does a very selected and unprotected equality test).  
-     */
-    public void testComplexScript() {
-        try {
-            matchFunctor = new ScriptMatchFunctor("JavaScript", SCRIPT);
-            assertTrue("Complex Requirement", matchFunctor.evaluatePolicyRequirement(filterContext));
-            assertTrue("Complex Value", matchFunctor.evaluatePermitValue(filterContext, sAttribute.getId(), "one"));
-            assertFalse("Complex Value", matchFunctor.evaluatePermitValue(filterContext, sAttribute.getId(), "two"));
-            assertFalse("Complex Value", matchFunctor.evaluatePermitValue(filterContext, iAttribute.getId(), "two"));
-            assertFalse("Complex Value", matchFunctor.evaluatePermitValue(filterContext, scope.getId(), "ScopedScope"));
-        } catch (FilterProcessingException e) {
-           fail(e.getLocalizedMessage());
-        }
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/all-wcprops
deleted file mode 100644
index a02a538..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/all-wcprops
+++ /dev/null
@@ -1,53 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 143
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml
-END
-AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 203
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java
-END
-AttributeRequesterInEntityGroupMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 200
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterInEntityGroupMatchFunctorTestCase.java
-END
-AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java
-END
-AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 203
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java
-END
-AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 200
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java
-END
-AttributeIssuerInEntityGroupMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 197
-/java-shib-common/!svn/ver/1016/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeIssuerInEntityGroupMatchFunctorTestCase.java
-END
-AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 206
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java
-END
-AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 203
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/entries
deleted file mode 100644
index 6fdc580..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/entries
+++ /dev/null
@@ -1,300 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.590716Z
-065f2226f9ef8104bf19f9887b9ef88e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7132
-

-AttributeRequesterInEntityGroupMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.590716Z
-8aba227b8e39b46f65f99f8c05ff77b5
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2945
-

-AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.586716Z
-d185c0eec32021dd126edaad9b891460
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7201
-

-AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.586716Z
-a47102682373b74d853656a77b66f651
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7669
-

-AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.590716Z
-d183fd53f8be6a060c8ad630fae9d469
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3366
-

-AttributeIssuerInEntityGroupMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.590716Z
-fc402f5ab5436eea9e8c8bc8d3d82b10
-2012-02-26T22:35:41.733550Z
-1016
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2913
-

-AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.590716Z
-eceba5c8db5fa5af8b5637e9a238f548
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7738
-

-AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.590716Z
-0febc68964f1f6ce918292f8b8759422
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3397
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerInEntityGroupMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterInEntityGroupMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/prop-base/AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index 3a091be..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeIssuerEntityAttributeExactMatchFunctor} unit test. */
-public class AttributeIssuerEntityAttributeExactMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        metadataFile = MD_PATH + "/shibboleth.net-metadata.xml";
-        issuerEntityId = "https://idp.shibboleth.net/idp/shibboleth";
-        requesterEntityId = "https://issues.shibboleth.net/shibboleth";
-
-        super.setUp();
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeIssuerEntityAttributeExactMatchFunctor functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:1234");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:WXYZ");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:WXYZ");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeIssuerEntityAttributeExactMatchFunctor functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:1234");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:WXYZ");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:WXYZ");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeIssuerEntityAttributeExactMatchFunctor functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:1234");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:WXYZ");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:WXYZ");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index 23d1689..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerEntityAttributeRegexMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import java.util.regex.Pattern;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeIssuerEntityAttributeRegexMatchFunctor} unit test. */
-public class AttributeIssuerEntityAttributeRegexMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        metadataFile = MD_PATH + "/shibboleth.net-metadata.xml";
-        issuerEntityId = "https://idp.shibboleth.net/idp/shibboleth";
-        requesterEntityId = "https://issues.shibboleth.net/shibboleth";
-
-        super.setUp();
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeIssuerEntityAttributeRegexMatchFunctor functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:12.*"));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:WX.*"));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:WX.*"));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeIssuerEntityAttributeRegexMatchFunctor functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:12.*"));
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:WX.*"));
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:WX.*"));
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeIssuerEntityAttributeRegexMatchFunctor functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:12.*"));
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:WX.*"));
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:WX.*"));
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index 07b4d0a..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerInEntityGroupMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeIssuerInEntityGroupMatchFunctor} unit test. */
-public class AttributeIssuerInEntityGroupMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        requestContext.setLocalEntityMetadata(requestContext.getMetadataProvider().getEntityDescriptor(
-                "urn:mace:incommon:internet2.edu"));
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeIssuerInEntityGroupMatchFunctor functor = new AttributeIssuerInEntityGroupMatchFunctor();
-        functor.setEntityGroup("urn:mace:incommon");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerInEntityGroupMatchFunctor();
-        functor.setEntityGroup("foo");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeIssuerInEntityGroupMatchFunctor functor = new AttributeIssuerInEntityGroupMatchFunctor();
-        functor.setEntityGroup("urn:mace:incommon");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerInEntityGroupMatchFunctor();
-        functor.setEntityGroup("foo");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeIssuerInEntityGroupMatchFunctor functor = new AttributeIssuerInEntityGroupMatchFunctor();
-        functor.setEntityGroup("urn:mace:incommon");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerInEntityGroupMatchFunctor();
-        functor.setEntityGroup("foo");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index cdfd27f..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeIssuerNameIDFormatExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeIssuerNameIDFormatExactMatchFunctor} unit test. */
-public class AttributeIssuerNameIDFormatExactMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    protected void setUp() throws Exception {
-        metadataFile = MD_PATH + "/shibboleth.net-metadata.xml";
-        issuerEntityId = "https://idp.shibboleth.net/idp/shibboleth";
-        requesterEntityId = "https://issues.shibboleth.net/shibboleth";
-
-        super.setUp();
-        
-        requestContext.setLocalEntityRoleMetadata(requestContext.getLocalEntityMetadata().getRoleDescriptors().get(0));
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeIssuerNameIDFormatExactMatchFunctor functor = new AttributeIssuerNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeIssuerNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeIssuerNameIDFormatExactMatchFunctor functor = new AttributeIssuerNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeIssuerNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeIssuerNameIDFormatExactMatchFunctor functor = new AttributeIssuerNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeIssuerNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index 5bf4421..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeRequesterEntityAttributeExactMatchFunctor} unit test. */
-public class AttributeRequesterEntityAttributeExactMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        metadataFile = MD_PATH + "/shibboleth.net-metadata.xml";
-        issuerEntityId = "https://issues.shibboleth.net/shibboleth";
-        requesterEntityId = "https://idp.shibboleth.net/idp/shibboleth";
-
-        super.setUp();
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeRequesterEntityAttributeExactMatchFunctor functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:1234");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:WXYZ");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:WXYZ");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeRequesterEntityAttributeExactMatchFunctor functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:1234");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:WXYZ");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:WXYZ");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeRequesterEntityAttributeExactMatchFunctor functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:1234");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValue("urn:example.org:policy:WXYZ");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValue("urn:example.org:entitlements:WXYZ");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeExactMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValue("urn:example.org:entitlements:ABCD");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index e93b9cb..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterEntityAttributeRegexMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import java.util.regex.Pattern;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeRequesterEntityAttributeRegexMatchFunctor} unit test. */
-public class AttributeRequesterEntityAttributeRegexMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        metadataFile = MD_PATH + "/shibboleth.net-metadata.xml";
-        issuerEntityId = "https://issues.shibboleth.net/shibboleth";
-        requesterEntityId = "https://idp.shibboleth.net/idp/shibboleth";
-
-        super.setUp();
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeRequesterEntityAttributeRegexMatchFunctor functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:12.*"));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:WX.*"));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:WX.*"));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeRequesterEntityAttributeRegexMatchFunctor functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:12.*"));
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:WX.*"));
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:WX.*"));
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeRequesterEntityAttributeRegexMatchFunctor functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:12.*"));
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:policies");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:policy\\:WX.*"));
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:uri");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:WX.*"));
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterEntityAttributeRegexMatchFunctor();
-        functor.setName("urn:example.org:entitlements");
-        functor.setNameFormat("urn:oasis:names:tc:SAML:2.0:attrname-format:basic");
-        functor.setValueRegex(Pattern.compile("urn\\:example.org\\:entitlements\\:12.*"));
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index 1ebf35a..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterInEntityGroupMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeRequesterInEntityGroupMatchFunctor} unit test. */
-public class AttributeRequesterInEntityGroupMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        requestContext.setPeerEntityMetadata(requestContext.getMetadataProvider().getEntityDescriptor(
-                "urn:mace:incommon:internet2.edu"));
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeRequesterInEntityGroupMatchFunctor functor = new AttributeRequesterInEntityGroupMatchFunctor();
-        functor.setEntityGroup("urn:mace:incommon");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterInEntityGroupMatchFunctor();
-        functor.setEntityGroup("foo");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeRequesterInEntityGroupMatchFunctor functor = new AttributeRequesterInEntityGroupMatchFunctor();
-        functor.setEntityGroup("urn:mace:incommon");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterInEntityGroupMatchFunctor();
-        functor.setEntityGroup("foo");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeRequesterInEntityGroupMatchFunctor functor = new AttributeRequesterInEntityGroupMatchFunctor();
-        functor.setEntityGroup("urn:mace:incommon");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterInEntityGroupMatchFunctor();
-        functor.setEntityGroup("foo");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java.svn-base
deleted file mode 100644
index f978aad..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/saml/.svn/text-base/AttributeRequesterNameIDFormatExactMatchFunctorTestCase.java.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.saml;
-
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.match.BaseTestCaseMetadata;
-
-/** {@link AttributeRequesterNameIDFormatExactMatchFunctor} unit test. */
-public class AttributeRequesterNameIDFormatExactMatchFunctorTestCase extends BaseTestCaseMetadata {
-
-    protected void setUp() throws Exception {
-        metadataFile = MD_PATH + "/shibboleth.net-metadata.xml";
-        issuerEntityId = "https://issues.shibboleth.net/shibboleth";
-        requesterEntityId = "https://idp.shibboleth.net/idp/shibboleth";
-
-        super.setUp();
-        
-        requestContext.setPeerEntityRoleMetadata(requestContext.getPeerEntityMetadata().getRoleDescriptors().get(0));
-    }
-
-    public void testEvaluatePolicyRequirement() throws Exception {
-        AttributeRequesterNameIDFormatExactMatchFunctor functor = new AttributeRequesterNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
-        assertTrue(functor.evaluatePolicyRequirement(filterContext));
-
-        functor = new AttributeRequesterNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
-        assertFalse(functor.evaluatePolicyRequirement(filterContext));
-    }
-
-    public void testEvaluatePermitValue() throws Exception {
-        AttributeRequesterNameIDFormatExactMatchFunctor functor = new AttributeRequesterNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
-        assertTrue(functor.evaluatePermitValue(filterContext, null, null));
-
-        functor = new AttributeRequesterNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
-        assertFalse(functor.evaluatePermitValue(filterContext, null, null));
-    }
-
-    public void testEvaluateDenyRule() throws Exception {
-        AttributeRequesterNameIDFormatExactMatchFunctor functor = new AttributeRequesterNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
-        assertTrue(functor.evaluateDenyRule(filterContext, null, null));
-
-        functor = new AttributeRequesterNameIDFormatExactMatchFunctor();
-        functor.setNameIdFormat("urn:oasis:names:tc:SAML:2.0:nameid-format:persistent");
-        assertFalse(functor.evaluateDenyRule(filterContext, null, null));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/all-wcprops
deleted file mode 100644
index 3e8c385..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 121
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/entries
deleted file mode 100644
index b36c223..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-provider
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/all-wcprops
deleted file mode 100644
index 9260ffd..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 130
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/entries
deleted file mode 100644
index 768a80e..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-attributeDefinition
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/all-wcprops
deleted file mode 100644
index 077007f..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 150
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition
-END
-MappedAttributeDefinitionTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 185
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/MappedAttributeDefinitionTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/entries
deleted file mode 100644
index 40f2aa0..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-MappedAttributeDefinitionTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.206708Z
-df9009dcf16095f4934954c9883c75c4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7677
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/prop-base/MappedAttributeDefinitionTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/MappedAttributeDefinitionTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/MappedAttributeDefinitionTest.java.svn-base
deleted file mode 100644
index 7618056..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/attributeDefinition/.svn/text-base/MappedAttributeDefinitionTest.java.svn-base
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.attributeDefinition;
-
-import java.util.ArrayList;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethResolutionContext;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.StaticDataConnector;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.profile.provider.SAMLProfileRequestContext;
-import junit.framework.TestCase;
-
-/** Unit test for {@link MappedAttributeDefinition}. */
-public class MappedAttributeDefinitionTest extends TestCase{
-
-    private ShibbolethResolutionContext resolutionContext;
-    
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        BasicAttribute<String> affiliation = new BasicAttribute<String>("affiliation");
-        affiliation.getValues().add("staff");
-        affiliation.getValues().add("student");
-        affiliation.getValues().add("partime-employee");
-        affiliation.getValues().add(null);
-        
-        ArrayList<BaseAttribute<String>> attributes = new ArrayList<BaseAttribute<String>>();
-        attributes.add(affiliation);
-        
-        StaticDataConnector data = new StaticDataConnector(attributes);
-        
-        SAMLProfileRequestContext requestCtx = new BaseSAMLProfileRequestContext();
-        resolutionContext = new ShibbolethResolutionContext(requestCtx);
-        resolutionContext.getResolvedPlugins().put("affiliation", data);
-    }
-    
-    public void testBasicMapping() throws AttributeResolutionException{
-        String foo = "foo";
-        String bar = "bar";
-        String baz = "baz";
-        
-        ValueMap fooValueMap = new ValueMap();
-        fooValueMap.setReturnValue(foo);
-        fooValueMap.getSourceValues().add(fooValueMap.new SourceValue("staff", false, false));
-        
-        ValueMap barValueMap = new ValueMap();
-        barValueMap.setReturnValue(bar);
-        barValueMap.getSourceValues().add(barValueMap.new SourceValue("student.*", false, false));
-        
-        MappedAttributeDefinition attributeDefinition = new MappedAttributeDefinition();
-        attributeDefinition.setId("map1");
-        attributeDefinition.setSourceAttributeID("affiliation");
-        attributeDefinition.getDependencyIds().add("affiliation");
-        attributeDefinition.setDefaultValue("baz");
-        attributeDefinition.getValueMaps().add(fooValueMap);
-        attributeDefinition.getValueMaps().add(barValueMap);
-        
-        BaseAttribute mapAttrib = attributeDefinition.resolve(resolutionContext);
-        assertEquals("map1", mapAttrib.getId());
-        assertEquals(3, mapAttrib.getValues().size());
-        assertEquals(true, mapAttrib.getValues().contains(foo));
-        assertEquals(true, mapAttrib.getValues().contains(bar));
-        assertEquals(true, mapAttrib.getValues().contains(baz));
-    }
-    
-    public void testCaseInsensitveMatch() throws AttributeResolutionException {
-        String fooValue = "foo";
-        String barValue = "bar";
-        
-        ValueMap fooValueMap = new ValueMap();
-        fooValueMap.setReturnValue(fooValue);
-        fooValueMap.getSourceValues().add(fooValueMap.new SourceValue("STAFF", true, false));
-        
-        ValueMap barValueMap = new ValueMap();
-        barValueMap.setReturnValue(barValue);
-        barValueMap.getSourceValues().add(barValueMap.new SourceValue("STUDENT", false, false));
-        
-        MappedAttributeDefinition attributeDefinition = new MappedAttributeDefinition();
-        attributeDefinition.setId("map1");
-        attributeDefinition.setSourceAttributeID("affiliation");
-        attributeDefinition.getDependencyIds().add("affiliation");
-        attributeDefinition.getValueMaps().add(fooValueMap);
-        attributeDefinition.getValueMaps().add(barValueMap);
-        
-        BaseAttribute mapAttrib = attributeDefinition.resolve(resolutionContext);
-        assertEquals("map1", mapAttrib.getId());
-        assertEquals(1, mapAttrib.getValues().size());
-        assertEquals(true, mapAttrib.getValues().contains(fooValue));
-        assertEquals(false, mapAttrib.getValues().contains(barValue));
-    }
-    
-    public void testPartialMatch() throws AttributeResolutionException {
-        String fooValue = "foo";
-        
-        ValueMap fooValueMap = new ValueMap();
-        fooValueMap.setReturnValue(fooValue);
-        fooValueMap.getSourceValues().add(fooValueMap.new SourceValue("employee", false, true));
-        
-        MappedAttributeDefinition attributeDefinition = new MappedAttributeDefinition();
-        attributeDefinition.setId("map1");
-        attributeDefinition.setSourceAttributeID("affiliation");
-        attributeDefinition.getDependencyIds().add("affiliation");
-        attributeDefinition.getValueMaps().add(fooValueMap);
-        
-        BaseAttribute mapAttrib = attributeDefinition.resolve(resolutionContext);
-        assertEquals("map1", mapAttrib.getId());
-        assertEquals(1, mapAttrib.getValues().size());
-        assertEquals(true, mapAttrib.getValues().contains(fooValue));
-    }
-    
-    public void testPassThrough() throws AttributeResolutionException{
-        String foo = "foo";
-        String bar = "bar";
-        
-        ValueMap fooValueMap = new ValueMap();
-        fooValueMap.setReturnValue(foo);
-        fooValueMap.getSourceValues().add(fooValueMap.new SourceValue("staff", false, false));
-        
-        ValueMap barValueMap = new ValueMap();
-        barValueMap.setReturnValue(bar);
-        barValueMap.getSourceValues().add(barValueMap.new SourceValue("student", false, false));
-        
-        MappedAttributeDefinition attributeDefinition = new MappedAttributeDefinition();
-        attributeDefinition.setId("map1");
-        attributeDefinition.setSourceAttributeID("affiliation");
-        attributeDefinition.getDependencyIds().add("affiliation");
-        attributeDefinition.setPassThru(true);
-        attributeDefinition.getValueMaps().add(fooValueMap);
-        attributeDefinition.getValueMaps().add(barValueMap);
-        
-        BaseAttribute mapAttrib = attributeDefinition.resolve(resolutionContext);
-        assertEquals("map1", mapAttrib.getId());
-        assertEquals(3, mapAttrib.getValues().size());
-        assertEquals(true, mapAttrib.getValues().contains(foo));
-        assertEquals(true, mapAttrib.getValues().contains(bar));
-        assertEquals(true, mapAttrib.getValues().contains("partime-employee"));
-    }
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/binding/.svn/all-wcprops
deleted file mode 100644
index aecabc9..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/java-shib-common/!svn/ver/740/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/binding
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/binding/.svn/entries
deleted file mode 100644
index 69013ba..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/binding
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2008-04-12T16:02:14.997005Z
-733
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-security
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/all-wcprops
deleted file mode 100644
index adb1c7c..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 119
-/java-shib-common/!svn/ver/740/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/entries
deleted file mode 100644
index 9fd9edf..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security/.svn/entries
+++ /dev/null
@@ -1,28 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/binding/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2008-04-12T16:02:14.997005Z
-733
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops
deleted file mode 100644
index d1b1876..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 110
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config
-END
-SpringConfigurationUtilsTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 144
-/java-shib-common/!svn/ver/1067/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtilsTest.java
-END
-BaseConfigTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/BaseConfigTestCase.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/entries
deleted file mode 100644
index 9ba9462..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/entries
+++ /dev/null
@@ -1,108 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-BaseConfigTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.758719Z
-4526f5b6f263e9bc91ebd578fed58ce8
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4057
-

-metadata
-dir
-

-attribute
-dir
-

-security
-dir
-

-relyingparty
-dir
-

-SpringConfigurationUtilsTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.758719Z
-e11d1f6d0bf9863508f1760b3713fe06
-2013-03-25T16:05:10.065158Z
-1067
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2444
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseConfigTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseConfigTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/BaseConfigTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringConfigurationUtilsTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringConfigurationUtilsTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/SpringConfigurationUtilsTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseConfigTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseConfigTestCase.java.svn-base
deleted file mode 100644
index a8fe192..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/BaseConfigTestCase.java.svn-base
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.opensaml.util.resource.ClasspathResource;
-import org.opensaml.util.resource.Resource;
-import org.opensaml.util.resource.ResourceException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.TestCaseBase;
-
-/**
- * Base unit test case for Spring configuration tests.
- */
-public abstract class BaseConfigTestCase extends TestCaseBase {
-
-    /** Configuration resources to be loaded for all unit tests. */
-    protected List<Resource> configResources;
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-        configResources = new ArrayList<Resource>();
-    }
-
-    /**
-     * Creates a Spring application context from the instance defined config resources.
-     * 
-     * @return the created context
-     * 
-     * @throws ResourceException thrown if there is a problem reading the configuration resources
-     */
-    protected ApplicationContext createSpringContext() throws ResourceException {
-        return createSpringContext(configResources);
-    }
-
-    /**
-     * Creates a Spring application context from the given configuration and any instance registered configurations.
-     * 
-     * @param config spring configuration file to be located on the classpath
-     * 
-     * @return the configured spring context
-     * 
-     * @throws ResourceException thrown if the given resources can not be located
-     */
-    protected ApplicationContext createSpringContext(String config) throws ResourceException {
-        String[] configs = new String[1];
-        configs[0] = config;
-        return createSpringContext(configs);
-    }
-
-    /**
-     * Creates a Spring application context from the given configurations and any instance registered configurations.
-     * 
-     * @param configs spring configuration files to be located on the classpath
-     * 
-     * @return the configured spring context
-     * 
-     * @throws ResourceException thrown if the given resources can not be located
-     */
-    protected ApplicationContext createSpringContext(String[] configs) throws ResourceException {
-        ArrayList<Resource> resources = new ArrayList<Resource>();
-        resources.addAll(configResources);
-        if (configs != null) {
-            for (String config : configs) {
-                resources.add(new ClasspathResource(config));
-            }
-        }
-
-        return createSpringContext(resources);
-    }
-
-    /**
-     * Creates a Spring context from the given resources.
-     * 
-     * @param configs context configuration resources
-     * 
-     * @return the created context
-     * 
-     * @throws ResourceException thrown if there is a problem reading the configuration resources
-     */
-    protected ApplicationContext createSpringContext(List<Resource> configs) throws ResourceException {
-        GenericApplicationContext gContext = new GenericApplicationContext();
-        SpringConfigurationUtils.populateRegistry(gContext, configs);
-        gContext.refresh();
-        return gContext;
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringConfigurationUtilsTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringConfigurationUtilsTest.java.svn-base
deleted file mode 100644
index d29c903..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/SpringConfigurationUtilsTest.java.svn-base
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-/**
- *
- */
-public class SpringConfigurationUtilsTest extends TestCase {
-
-    @SuppressWarnings("deprecation")
-    public void testDurationShort() {
-        
-        String dur1 = "PT20M";
-        String dur2 = "PT8H";
-        String dur3 = "PT24H";
-
-        Assert.assertEquals(1200000L, SpringConfigurationUtils.parseDurationToMillis(dur1, dur1, 0));
-        Assert.assertEquals(28800000L, SpringConfigurationUtils.parseDurationToMillis(dur2, dur2, 0));
-        Assert.assertEquals(86400000L, SpringConfigurationUtils.parseDurationToMillis(dur3, dur3, 0));
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testDurationLong() {
-        
-        String dur1 = "P1D";
-        String dur2 = "P7D";
-        String dur3 = "P1M";
-        String dur4 = "P2M";
-        String dur5 = "P3M";
-        String dur6 = "P1Y";
-
-        Assert.assertEquals(86400000L, SpringConfigurationUtils.parseDurationToMillis(dur1, dur1, 0));
-        Assert.assertEquals(86400000L * 7, SpringConfigurationUtils.parseDurationToMillis(dur2, dur2, 0));
-        Assert.assertEquals(86400000L * 31, SpringConfigurationUtils.parseDurationToMillis(dur3, dur3, 0));
-        Assert.assertEquals(86400000L * 61, SpringConfigurationUtils.parseDurationToMillis(dur4, dur4, 0));
-        Assert.assertEquals(86400000L * 92, SpringConfigurationUtils.parseDurationToMillis(dur5, dur5, 0));
-        Assert.assertEquals(86400000L * 365, SpringConfigurationUtils.parseDurationToMillis(dur6, dur6, 0));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops
deleted file mode 100644
index 04294e4..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 120
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute
-END
-SAML1AttributeAuthorityTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML1AttributeAuthorityTest.java
-END
-SAML2AttributeAuthorityTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/SAML2AttributeAuthorityTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries
deleted file mode 100644
index 3fd5876..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries
+++ /dev/null
@@ -1,102 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAML1AttributeAuthorityTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.678718Z
-f32071fbd804c538c8dc46e94f2f63b8
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3113
-

-SAML2AttributeAuthorityTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.678718Z
-69520e92dc54a0074675ae12d5f88465
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3109
-

-resolver
-dir
-

-filter
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/SAML1AttributeAuthorityTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/SAML1AttributeAuthorityTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/SAML1AttributeAuthorityTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/SAML2AttributeAuthorityTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/SAML2AttributeAuthorityTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/SAML2AttributeAuthorityTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/SAML1AttributeAuthorityTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/SAML1AttributeAuthorityTest.java.svn-base
deleted file mode 100644
index e81e269..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/SAML1AttributeAuthorityTest.java.svn-base
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute;
-
-import java.util.Map;
-
-import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
-import org.opensaml.xml.parse.BasicParserPool;
-import org.opensaml.xml.parse.ParserPool;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML1AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-
-/**
- * Unit tests for {@link SAML1AttributeAuthority}.
- */
-public class SAML1AttributeAuthorityTest extends BaseConfigTestCase {
-
-    private String inCommonMDURL;
-    
-    public void setUp() throws Exception {
-        super.setUp();
-        inCommonMDURL = "https://svn.shibboleth.net/java-opensaml2"
-                + "/branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/InCommon-metadata.xml";
-    }
-    
-    public void testResolution() throws Exception {
-        ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/attribute/service-config.xml", });
-
-        ParserPool parserPool = new BasicParserPool();
-
-        HTTPMetadataProvider mdProvider = new HTTPMetadataProvider(inCommonMDURL, 5000);
-        mdProvider.setParserPool(parserPool);
-        mdProvider.initialize();
-
-        RelyingPartyConfiguration rpConfig = new RelyingPartyConfiguration("mySP", "myIdP");
-
-        BaseSAMLProfileRequestContext context = new BaseSAMLProfileRequestContext();
-        context.setMetadataProvider(mdProvider);
-        context.setRelyingPartyConfiguration(rpConfig);
-        context.setPrincipalName("aUser");
-
-        SAML1AttributeAuthority aa = (SAML1AttributeAuthority) ac.getBean("shibboleth.SAML1AttributeAuthority");
-        Map<String, BaseAttribute> attributes = aa.getAttributes(context);
-
-        assertEquals(3, attributes.size());
-
-        assertNotNull(aa.buildAttributeStatement(null, attributes.values()));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/SAML2AttributeAuthorityTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/SAML2AttributeAuthorityTest.java.svn-base
deleted file mode 100644
index bdf7223..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/SAML2AttributeAuthorityTest.java.svn-base
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute;
-
-import java.util.Map;
-
-import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
-import org.opensaml.xml.parse.BasicParserPool;
-import org.opensaml.xml.parse.ParserPool;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.SAML2AttributeAuthority;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
-
-/** Unit tests for {@link SAML2AttributeAuthority}. */
-public class SAML2AttributeAuthorityTest extends BaseConfigTestCase {
-
-    private String inCommonMDURL;
-    
-    public void setUp() throws Exception {
-        super.setUp();
-        inCommonMDURL = "https://svn.shibboleth.net/java-opensaml2"
-                + "/branches/REL_2/src/test/resources/data/org/opensaml/saml2/metadata/InCommon-metadata.xml";
-    }
-    
-    public void testResolution() throws Exception {
-        ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/attribute/service-config.xml", });
-
-        ParserPool parserPool = new BasicParserPool();
-
-        HTTPMetadataProvider mdProvider = new HTTPMetadataProvider(inCommonMDURL, 5000);
-        mdProvider.setParserPool(parserPool);
-        mdProvider.initialize();
-
-        RelyingPartyConfiguration rpConfig = new RelyingPartyConfiguration("mySP", "myIdP");
-
-        BaseSAMLProfileRequestContext context = new BaseSAMLProfileRequestContext();
-        context.setMetadataProvider(mdProvider);
-        context.setRelyingPartyConfiguration(rpConfig);
-        context.setPrincipalName("aUser");
-
-        SAML2AttributeAuthority aa = (SAML2AttributeAuthority) ac.getBean("shibboleth.SAML2AttributeAuthority");
-        Map<String, BaseAttribute> attributes = aa.getAttributes(context);
-
-        assertEquals(3, attributes.size());
-
-        assertNotNull(aa.buildAttributeStatement(null, attributes.values()));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/all-wcprops
deleted file mode 100644
index 7a97c95..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 126
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter
-END
-AttributeFilterPolicyTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 157
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/AttributeFilterPolicyTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/entries
deleted file mode 100644
index 59dc4e8..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-AttributeFilterPolicyTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.674718Z
-86816366d050071a3eb1e7daf442c584
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4955
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/prop-base/AttributeFilterPolicyTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/prop-base/AttributeFilterPolicyTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/prop-base/AttributeFilterPolicyTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/text-base/AttributeFilterPolicyTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/text-base/AttributeFilterPolicyTest.java.svn-base
deleted file mode 100644
index 845721b..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/text-base/AttributeFilterPolicyTest.java.svn-base
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.filter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.opensaml.util.resource.ResourceException;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.AttributeFilteringException;
-import edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethAttributeFilteringEngine;
-import edu.internet2.middleware.shibboleth.common.attribute.provider.BasicAttribute;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-
-/**
- * Tests parsing an attribute filter policy configuration.
- */
-public class AttributeFilterPolicyTest extends BaseConfigTestCase {
-
-    private Map<String, BaseAttribute> attributes;
-
-    private BaseSAMLProfileRequestContext requestContext;
-
-    private ApplicationContext appContext;
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        attributes = new HashMap<String, BaseAttribute>();
-
-        BasicAttribute<String> firstName = new BasicAttribute<String>("firstName");
-        firstName.getValues().add("john");
-        attributes.put(firstName.getId(), firstName);
-
-        BasicAttribute<String> lastName = new BasicAttribute<String>("lastName");
-        lastName.getValues().add("smith");
-        attributes.put(lastName.getId(), lastName);
-
-        BasicAttribute<String> email = new BasicAttribute<String>("email");
-        email.getValues().add("jsmith at example.edu");
-        email.getValues().add("john.smith at example.edu");
-        attributes.put(email.getId(), email);
-
-        BasicAttribute<String> affiliation = new BasicAttribute<String>("affiliation");
-        affiliation.getValues().add("employee");
-        affiliation.getValues().add("staff");
-        affiliation.getValues().add("illegalValue");
-        attributes.put(affiliation.getId(), affiliation);
-
-        requestContext = new BaseSAMLProfileRequestContext();
-        requestContext.setPrincipalName("jsmith");
-        requestContext.setReleasedAttributes(attributes.keySet());
-
-        appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/attribute/filter/service-config.xml", });
-    }
-
-    public void testEngineA() throws ResourceException, AttributeFilteringException {
-        ShibbolethAttributeFilteringEngine filterEngine = (ShibbolethAttributeFilteringEngine) appContext
-                .getBean("engineA");
-        Map<String, BaseAttribute> filteredAttributes = filterEngine.filterAttributes(attributes, requestContext);
-
-        assertEquals(1, filteredAttributes.size());
-
-        BaseAttribute attribute;
-        attribute = filteredAttributes.get("firstName");
-        assertNull(attribute);
-
-        attribute = filteredAttributes.get("lastName");
-        assertNull(attribute);
-
-        attribute = filteredAttributes.get("email");
-        assertEquals(2, attribute.getValues().size());
-
-        attribute = filteredAttributes.get("affiliation");
-        assertNull(attribute);
-    }
-
-    public void testEngineB() throws ResourceException, AttributeFilteringException {
-        ShibbolethAttributeFilteringEngine filterEngine = (ShibbolethAttributeFilteringEngine) appContext
-                .getBean("engineB");
-        Map<String, BaseAttribute> filteredAttributes = filterEngine.filterAttributes(attributes, requestContext);
-
-        assertEquals(1, filteredAttributes.size());
-
-        BaseAttribute attribute;
-        attribute = filteredAttributes.get("firstName");
-        assertNull(attribute);
-
-        attribute = filteredAttributes.get("lastName");
-        assertNull(attribute);
-
-        attribute = filteredAttributes.get("email");
-        assertNull(attribute);
-
-        attribute = filteredAttributes.get("affiliation");
-        assertEquals(2, attribute.getValues().size());
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops
deleted file mode 100644
index d4124ff..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 128
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver
-END
-TemplateAttributeResolverTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/TemplateAttributeResolverTest.java
-END
-BasicAttributeResolverTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/BasicAttributeResolverTest.java
-END
-DBAttributeResolverTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 157
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/DBAttributeResolverTest.java
-END
-MappedAttributeResolverTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 161
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/MappedAttributeResolverTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries
deleted file mode 100644
index ecfd898..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries
+++ /dev/null
@@ -1,164 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-DBAttributeResolverTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.670718Z
-1703656620ef3edc40ae11e66db54619
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3694
-

-MappedAttributeResolverTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.670718Z
-c34f26f8baa4df946b93f6d5b7f281f1
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3074
-

-TemplateAttributeResolverTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.670718Z
-649b6617660c8087ead3b0e3a7f5e73a
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2854
-

-BasicAttributeResolverTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.670718Z
-8f38148aa3573e65979580037e569602
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2832
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/BasicAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/BasicAttributeResolverTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/BasicAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/DBAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/DBAttributeResolverTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/DBAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/MappedAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/MappedAttributeResolverTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/MappedAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/TemplateAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/TemplateAttributeResolverTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/TemplateAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/BasicAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/BasicAttributeResolverTest.java.svn-base
deleted file mode 100644
index 55452ef..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/BasicAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import java.util.Map;
-
-import org.opensaml.util.resource.ResourceException;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolver;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-
-/**
- * Test configuration code for attribute resolver.
- */
-public class BasicAttributeResolverTest extends BaseConfigTestCase {
-
-    /**
-     * Test Handle Request.
-     * 
-     * @throws ResourceException if unable to access resource
-     * @throws AttributeResolutionException if unable to resolve attributes
-     */
-    public void testResolverInstantiation() throws ResourceException, AttributeResolutionException {
-        ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/attribute/resolver/resolver-config.xml", });
-        AttributeResolver resolver = (AttributeResolver) ac.getBean("resolver");
-
-        BaseSAMLProfileRequestContext context = new BaseSAMLProfileRequestContext();
-        context.setPrincipalName("ttrojan");
-
-        Map<String, BaseAttribute> actual = resolver.resolveAttributes(context);
-
-        assertEquals(3, actual.size());
-
-        BaseAttribute principalName = actual.get("principalName");
-        assertEquals(1, principalName.getValues().size());
-
-        BaseAttribute affiliation = actual.get("eduPersonAffiliation");
-        assertEquals(3, affiliation.getValues().size());
-
-        BaseAttribute entitlement = actual.get("eduPersonEntitlement");
-        assertEquals(1, entitlement.getValues().size());
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/DBAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/DBAttributeResolverTest.java.svn-base
deleted file mode 100644
index 5bcc1fa..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/DBAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import java.util.Map;
-
-import org.opensaml.util.resource.ResourceException;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolver;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-
-/**
- * Unit test for database data connector.
- */
-public class DBAttributeResolverTest extends BaseConfigTestCase {
-
-    /**
-     * Test Handle Request.
-     * 
-     * @throws ResourceException if unable to access resource
-     * @throws AttributeResolutionException if unable to resolve attributes
-     */
-    public void testResolverInstantiation() throws ResourceException, AttributeResolutionException {
-        ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/attribute/resolver/resolver-db-config.xml", });
-        AttributeResolver resolver = (AttributeResolver) ac.getBean("resolver-db");
-
-        BaseSAMLProfileRequestContext context = new BaseSAMLProfileRequestContext();
-        context.setPrincipalName("astone");
-
-        try {
-            Map<String, BaseAttribute> attributes = resolver.resolveAttributes(context);
-            
-            BaseAttribute uid = attributes.get("uid");
-            assertNotNull(uid);
-            assertEquals(1, uid.getValues().size());
-            assertTrue(uid.getValues().contains("astone"));
-            
-            BaseAttribute email = attributes.get("email");
-            assertNotNull(email);
-            assertEquals(1, email.getValues().size());
-            assertTrue(email.getValues().contains("astone at example.edu"));
-            
-            BaseAttribute firstName = attributes.get("FIRSTNAME");
-            assertNotNull(firstName);
-            assertEquals(1, firstName.getValues().size());
-            assertTrue(firstName.getValues().contains("Alexander"));
-            
-            BaseAttribute lastName = attributes.get("LASTNAME");
-            assertNotNull(lastName);
-            assertEquals(1, lastName.getValues().size());
-            assertTrue(lastName.getValues().contains("Stone"));
-            
-            BaseAttribute fullName = attributes.get("fullname");
-            assertNotNull(fullName);
-            assertEquals(1, fullName.getValues().size());
-            assertTrue(fullName.getValues().contains("Alexander Stone"));
-
-        } catch (AttributeResolutionException e) {
-            fail(e.getMessage());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/MappedAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/MappedAttributeResolverTest.java.svn-base
deleted file mode 100644
index f948b89..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/MappedAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import java.util.Map;
-
-import org.opensaml.util.resource.ResourceException;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolver;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-
-/**
- * Test configuration code for attribute resolver.
- */
-public class MappedAttributeResolverTest extends BaseConfigTestCase {
-
-    /**
-     * Test Handle Request.
-     * 
-     * @throws ResourceException if unable to access resource
-     * @throws AttributeResolutionException if unable to resolve attributes
-     */
-    public void testResolverInstantiation() throws ResourceException, AttributeResolutionException {
-        ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/attribute/resolver/resolver-mapped-config.xml", });
-        AttributeResolver resolver = (AttributeResolver) ac.getBean("resolver-mapped");
-
-        BaseSAMLProfileRequestContext context = new BaseSAMLProfileRequestContext();
-        context.setPrincipalName("ttrojan");
-
-        Map<String, BaseAttribute> actual = resolver.resolveAttributes(context);
-        String[] expectedValues;
-
-        BaseAttribute affiliation = actual.get("eduPersonAffilation");
-        assertEquals(3, affiliation.getValues().size());
-
-        expectedValues = new String[] { "member", "parent", "staff" };
-        assertEquals(expectedValues, affiliation.getValues().toArray(expectedValues));
-
-        BaseAttribute firstColor = actual.get("firstColor");
-        assertEquals(1, firstColor.getValues().size());
-
-        expectedValues = new String[] { "red" };
-        assertEquals(expectedValues, firstColor.getValues().toArray(expectedValues));
-
-        // test bug SIDP-22
-        assertFalse(actual.containsKey("fooBar"));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/TemplateAttributeResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/TemplateAttributeResolverTest.java.svn-base
deleted file mode 100644
index 85b4a97..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/TemplateAttributeResolverTest.java.svn-base
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.attribute.resolver;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.opensaml.util.resource.ResourceException;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolutionException;
-import edu.internet2.middleware.shibboleth.common.attribute.resolver.AttributeResolver;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
-
-/**
- * Test configuration code for attribute resolver.
- */
-public class TemplateAttributeResolverTest extends BaseConfigTestCase {
-
-    /**
-     * Test Handle Request.
-     * 
-     * @throws ResourceException if unable to access resource
-     * @throws AttributeResolutionException if unable to resolve attributes
-     */
-    public void testTemplateAttributeDefinition() throws ResourceException, AttributeResolutionException {
-        ApplicationContext ac = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/attribute/resolver/resolver-template-config.xml", });
-        AttributeResolver resolver = (AttributeResolver) ac.getBean("resolver-template");
-
-        BaseSAMLProfileRequestContext context = new BaseSAMLProfileRequestContext();
-        context.setPrincipalName("gpburdell");
-
-        Map<String, BaseAttribute> actual = resolver.resolveAttributes(context);
-        String[] expectedValues;
-
-        BaseAttribute enrollment = actual.get("courseEnrollment");
-        assertEquals(2, enrollment.getValues().size());
-
-        expectedValues = new String[] { "urn:mace:example.edu:enrollment:20073:eng101:a3",
-                "urn:mace:example.edu:enrollment:20073:math203:2", };
-        assertEquals(Arrays.asList(expectedValues), enrollment.getValues());
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops
deleted file mode 100644
index b2e5b08..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops
+++ /dev/null
@@ -1,35 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 119
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata
-END
-InlineMetadataProviderTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 150
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/InlineMetadataProviderTest.java
-END
-HTTPMetadataProviderTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPMetadataProviderTest.java
-END
-ChainingMetadataProviderTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProviderTest.java
-END
-FilesystemMetadataProviderTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 154
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/FilesystemMetadataProviderTest.java
-END
-ResourceMetadataProviderTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 152
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/ResourceMetadataProviderTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries
deleted file mode 100644
index 28f3029..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries
+++ /dev/null
@@ -1,198 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-InlineMetadataProviderTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.606716Z
-76cd4b6e956aff0d8896a53adbcf8251
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4447
-

-HTTPMetadataProviderTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.606716Z
-d73d44402a25c3bf5f5eedc17b7057aa
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2936
-

-ChainingMetadataProviderTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.606716Z
-7f02f2c85ae8c88576a3e5683aa3fb11
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4138
-

-FilesystemMetadataProviderTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.606716Z
-f8b5d74c727492ead468a9d3ba793b47
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3413
-

-ResourceMetadataProviderTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.606716Z
-131c6be0ac40912a77b6873657bc800d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2922
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProviderTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProviderTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProviderTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProviderTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ResourceMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ResourceMetadataProviderTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ResourceMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProviderTest.java.svn-base
deleted file mode 100644
index e15ad1a..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import org.opensaml.saml2.metadata.provider.ChainingMetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for Chaining metadata providers works correctly.
- */
-public class ChainingMetadataProviderTest extends BaseConfigTestCase {
-    
-    private String entityId1 = "urn:mace:incommon:washington.edu";
-    private String entityId2 = "urn:mace:eduserv.org.uk:athens:federation:beta";
-
-    /**
-     * Test configuring an chaining metadata provider with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiation() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/ChainingMetadataProvider1.xml", });
-
-        ChainingMetadataProvider provider = (ChainingMetadataProvider) appContext.getBean("ChainingMetadata");
-        assertNotNull(provider);
-        
-        assertNotNull("Did not find expected entity ID " + entityId1, provider.getEntityDescriptor(entityId1));
-        assertNotNull("Did not find expected entity ID " + entityId2, provider.getEntityDescriptor(entityId2));
-    }
-    
-    /**
-     * Test configuring an chaining metadata provider with Spring, with a disallowed metadata filter on the chain. 
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiationWithFilter() throws Exception {
-        try {
-            createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                    DATA_PATH + "/config/metadata/ChainingMetadataProvider2.xml", });
-            fail("Chaining metadata provider instantiation should have failed, due to disallowed metadata filter");
-        } catch (Exception e) {
-            //do nothing, expected
-        }
-    }
-    
-    /**
-     * Test configuring an chaining metadata provider with Spring, where the child members have filters.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiationWithFiltersOnMembers() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/ChainingMetadataProvider3.xml", });
-
-        ChainingMetadataProvider provider = (ChainingMetadataProvider) appContext.getBean("ChainingMetadata");
-        assertNotNull(provider);
-        assertNull("Chaining provider had disallowed metadata filter", provider.getMetadataFilter());
-        
-        MetadataProvider member0 = provider.getProviders().get(0);
-        assertNotNull("Chain member 0 had no filter present", member0.getMetadataFilter());
-        
-        MetadataProvider member1 = provider.getProviders().get(1);
-        assertNotNull("Chain member 1 had no filter present", member1.getMetadataFilter());
-        
-        assertFalse("Chain members had the same filter", member0.getMetadataFilter() == member1.getMetadataFilter());
-    }
-    
-    
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProviderTest.java.svn-base
deleted file mode 100644
index ea0b396..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.saml2.metadata.provider.SchemaValidationFilter;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for filesytem metadata providers works correctly.
- */
-public class FilesystemMetadataProviderTest extends BaseConfigTestCase {
-
-    /**
-     * Test configuring an filesystem metadata provider with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiation() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/FilesystemMetadataProvider1.xml", });
-
-        MetadataProvider provider = (MetadataProvider) appContext.getBean("FilesystemMetadata");
-        assertNotNull(provider);
-        assertEquals(((EntitiesDescriptor) provider.getMetadata()).getName(), "urn:mace:incommon");
-    }
-    
-    /**
-     * Test configuring an filesystem metadata provider with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiationWithFilter() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/FilesystemMetadataProvider3.xml", });
-
-        MetadataProvider provider = (MetadataProvider) appContext.getBean("FilesystemMetadata");
-        assertNotNull(provider);
-        
-        assertNotNull("Missing metadata filter property", provider.getMetadataFilter());
-        assertTrue("Wrong metadata filter property", provider.getMetadataFilter() instanceof SchemaValidationFilter);
-    }
-
-
-    /**
-     * Test configuring an filesystem metadata provider with an invalid Spring configuration.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testFailedProviderInstantiation() throws Exception {
-        String[] configs = { "/data/conf/shibboleth-2.0-config-internal.xml",
-                DATA_PATH + "/config/metadata/FilesystemMetadataProvider2.xml", };
-        try {
-            createSpringContext(configs);
-            fail("Spring loaded invalid configuration");
-        } catch (Exception e) {
-            // expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProviderTest.java.svn-base
deleted file mode 100644
index 64eaa89..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
-import org.opensaml.saml2.metadata.provider.SchemaValidationFilter;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for URL metadata providers works correctly.
- */
-public class HTTPMetadataProviderTest extends BaseConfigTestCase {
-
-    /**
-     * Test configuring an filesystem metadata provider with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiation() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/HTTPMetadataProvider1.xml", });
-
-        HTTPMetadataProvider provider = (HTTPMetadataProvider) appContext.getBean("URLMetadata");
-        assertNotNull(provider);
-        assertTrue(provider.requireValidMetadata());
-        assertEquals(7200000L, provider.getMaxRefreshDelay());
-        
-        assertEquals(((EntitiesDescriptor) provider.getMetadata()).getName(), "urn:mace:incommon");
-    }
-    
-    /**
-     * Test configuring an filesystem metadata provider with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiationWithFilter() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/HTTPMetadataProvider2.xml", });
-
-        HTTPMetadataProvider provider = (HTTPMetadataProvider) appContext.getBean("URLMetadata");
-        assertNotNull(provider);
-        
-        assertNotNull("Missing metadata filter property", provider.getMetadataFilter());
-        assertTrue("Wrong metadata filter property", provider.getMetadataFilter() instanceof SchemaValidationFilter);
-    }
-    
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProviderTest.java.svn-base
deleted file mode 100644
index 4a510fd..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml2.metadata.provider.MetadataProvider;
-import org.opensaml.saml2.metadata.provider.SchemaValidationFilter;
-import org.opensaml.util.resource.ResourceException;
-import org.springframework.context.ApplicationContext;
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for inline metadata providers works correctly.
- */
-public class InlineMetadataProviderTest extends BaseConfigTestCase {
-
-    /**
-     * Tests that an Inline provider is properly created when given an {@link EntitiesDescriptor}.
-     * 
-     * @throws Exception thrown if there is an error using the configuration
-     */
-    public void testProviderInstantiationEntitiesDescriptor() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/InlineMetadataProvider1.xml" });
-
-        MetadataProvider provider = (MetadataProvider) appContext.getBean("InlineMetadata");
-        assertNotNull(provider);
-        assertEquals(((EntitiesDescriptor) provider.getMetadata()).getName(), "urn:mace:incommon");
-    }
-
-    /**
-     * Tests that an Inline provider is properly created when given an {@link EntityDescriptor}.
-     * 
-     * @throws Exception thrown if there is an error using the configuration
-     */
-    public void testProviderInstantiationEntityDescriptor() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/InlineMetadataProvider2.xml" });
-
-        MetadataProvider provider = (MetadataProvider) appContext.getBean("InlineMetadata");
-        assertNotNull(provider);
-        assertEquals(((EntityDescriptor) provider.getMetadata()).getEntityID(), "urn:mace:incommon:internet2.edu");
-    }
-
-    /**
-     * Tests that an Inline provider is properly created when given an {@link EntitiesDescriptor} with a MetadataFilter.
-     * 
-     * @throws Exception thrown if there is an error using the configuration
-     */
-    public void testProviderInstantiationWithFilter() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/InlineMetadataProvider4.xml" });
-
-        MetadataProvider provider = (MetadataProvider) appContext.getBean("InlineMetadata");
-        assertNotNull(provider);
-        assertEquals(((EntitiesDescriptor) provider.getMetadata()).getName(), "urn:mace:incommon");
-
-        assertNotNull("Missing metadata filter property", provider.getMetadataFilter());
-        assertTrue("Wrong metadata filter property", provider.getMetadataFilter() instanceof SchemaValidationFilter);
-    }
-
-    /**
-     * Tests that an Inline provider is properly created when given an {@link EntitiesDescriptor}.
-     * 
-     * @throws Exception thrown if there is an error using the configuration
-     */
-    public void testFailedProviderInstantiation() throws Exception {
-        try {
-            createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                    DATA_PATH + "/config/metadata/InlineMetadataProvider3.xml" });
-            fail("Loaded invalid configuration file.");
-        } catch (ResourceException e) {
-            // expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ResourceMetadataProviderTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ResourceMetadataProviderTest.java.svn-base
deleted file mode 100644
index d74a3a8..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ResourceMetadataProviderTest.java.svn-base
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.metadata;
-
-import org.opensaml.saml2.metadata.EntitiesDescriptor;
-import org.opensaml.saml2.metadata.provider.ResourceBackedMetadataProvider;
-import org.opensaml.saml2.metadata.provider.SchemaValidationFilter;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for URL metadata providers works correctly.
- */
-public class ResourceMetadataProviderTest extends BaseConfigTestCase {
-
-    /**
-     * Test configuring an resource metadata provider with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiation() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/HTTPResourceMetadataProvider1.xml", });
-
-        ResourceBackedMetadataProvider provider = 
-            (ResourceBackedMetadataProvider) appContext.getBean("ResourceMetadata");
-        assertNotNull(provider);
-        
-        assertEquals(((EntitiesDescriptor) provider.getMetadata()).getName(), "urn:mace:incommon");
-    }
-    
-    /**
-     * Test configuring an resource metadata provider with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testProviderInstantiationWithFilter() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/metadata/HTTPResourceMetadataProvider2.xml", });
-
-        ResourceBackedMetadataProvider provider = 
-            (ResourceBackedMetadataProvider) appContext.getBean("ResourceMetadata");
-        assertNotNull(provider);
-        
-        assertNotNull("Missing metadata filter property", provider.getMetadataFilter());
-        assertTrue("Wrong metadata filter property", provider.getMetadataFilter() instanceof SchemaValidationFilter);
-    }
-    
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops
deleted file mode 100644
index 727e1b1..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 122
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty
-END
-SAMLMDRelyingPartyConfigurationManagerTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 170
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/SAMLMDRelyingPartyConfigurationManagerTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries
deleted file mode 100644
index 991e060..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SAMLMDRelyingPartyConfigurationManagerTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.758719Z
-b6bd741a5e076074e56d0aa3416d04c2
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2145
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/SAMLMDRelyingPartyConfigurationManagerTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/SAMLMDRelyingPartyConfigurationManagerTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/SAMLMDRelyingPartyConfigurationManagerTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/SAMLMDRelyingPartyConfigurationManagerTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/SAMLMDRelyingPartyConfigurationManagerTest.java.svn-base
deleted file mode 100644
index c5f7588..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/SAMLMDRelyingPartyConfigurationManagerTest.java.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.relyingparty;
-
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-import edu.internet2.middleware.shibboleth.common.relyingparty.provider.SAMLMDRelyingPartyConfigurationManager;
-
-/**
- * Unit test of {@link SAMLMDRelyingPartyConfigurationManager}.
- */
-public class SAMLMDRelyingPartyConfigurationManagerTest extends BaseConfigTestCase {
-
-    /** Test loading the relying party configuration manager. */
-    public void testManager() throws Exception {
-        String[] configs = { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/relyingparty/service-config.xml", };
-
-        ApplicationContext appContext = createSpringContext(configs);
-        SAMLMDRelyingPartyConfigurationManager rpConfigMgr = (SAMLMDRelyingPartyConfigurationManager) appContext
-                .getBean("relyingPartyManager");
-
-        assertNotNull(rpConfigMgr);
-        assertNotNull(rpConfigMgr.getAnonymousRelyingConfiguration());
-        assertNotNull(rpConfigMgr.getDefaultRelyingPartyConfiguration());
-        assertNotNull(rpConfigMgr.getRelyingPartyConfiguration("urn:mace:incommon"));
-        assertNotNull(rpConfigMgr.getMetadataProvider());
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops
deleted file mode 100644
index 5d1b5ea..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops
+++ /dev/null
@@ -1,35 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 118
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/security
-END
-StaticPKIXX509CredentialTrustEngineTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXX509CredentialTrustEngineTest.java
-END
-CertPathPKIXValidationOptionsTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 157
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptionsTest.java
-END
-StaticPKIXSignatureTrustEngineTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXSignatureTrustEngineTest.java
-END
-PKIXValidationOptionsTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 149
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationOptionsTest.java
-END
-PKIXValidationOptionsTrustEngineTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationOptionsTrustEngineTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries
deleted file mode 100644
index 16c1b79..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries
+++ /dev/null
@@ -1,198 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-PKIXValidationOptionsTrustEngineTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.682718Z
-ab632c046d7c3b691602c2ade3830f9d
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6902
-

-StaticPKIXX509CredentialTrustEngineTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.682718Z
-6cdd9e48f15a5c8d69cfbf954a03a675
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4043
-

-CertPathPKIXValidationOptionsTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.682718Z
-f6c33ffe1283378707608f64685785a4
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3924
-

-StaticPKIXSignatureTrustEngineTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.682718Z
-bcc7406c6bac7491a2c34c2c52f67a58
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3998
-

-PKIXValidationOptionsTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.682718Z
-5a5f3c926123193488d335500da119d7
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4465
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptionsTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptionsTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptionsTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsTrustEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsTrustEngineTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptionsTrustEngineTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngineTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngineTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptionsTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptionsTest.java.svn-base
deleted file mode 100644
index c1df367..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptionsTest.java.svn-base
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import org.opensaml.xml.security.x509.CertPathPKIXValidationOptions;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for CertPathPKIXValidationOptions works correctly.
- */
-public class CertPathPKIXValidationOptionsTest extends BaseConfigTestCase {
-
-    /**
-     * Test configuring basic options with default values.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testDefaultValues() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/CertPathPKIXValidationOptions1.xml", });
-
-        CertPathPKIXValidationOptions pkixOptions = 
-            (CertPathPKIXValidationOptions) appContext.getBeansOfType(CertPathPKIXValidationOptions.class).values().iterator().next();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(true, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(true, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(true, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(1), pkixOptions.getDefaultVerificationDepth());
-        assertEquals(false, pkixOptions.isForceRevocationEnabled());
-        assertEquals(true, pkixOptions.isRevocationEnabled());
-    }
-    
-    /**
-     * Test configuring basic options with non-default values.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testNonDefaultValues() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/CertPathPKIXValidationOptions2.xml", });
-
-        CertPathPKIXValidationOptions pkixOptions = 
-            (CertPathPKIXValidationOptions) appContext.getBeansOfType(CertPathPKIXValidationOptions.class).values().iterator().next();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(false, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(false, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(false, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(3), pkixOptions.getDefaultVerificationDepth());
-        assertEquals(true, pkixOptions.isForceRevocationEnabled());
-        assertEquals(false, pkixOptions.isRevocationEnabled());
-    }
-
-    /**
-     * Test configuring an element with an invalid Spring configuration.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testFailedInstantiation() throws Exception {
-        String[] configs = { "/config/base-config.xml",
-                DATA_PATH + "/config/security/CertPathPKIXValidationOptions3.xml", };
-        try {
-            createSpringContext(configs);
-            fail("Spring loaded invalid configuration");
-        } catch (Exception e) {
-            // expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsTest.java.svn-base
deleted file mode 100644
index 228d4e8..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsTest.java.svn-base
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import org.opensaml.xml.security.x509.PKIXValidationOptions;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for PKIXValidationOptions works correctly.
- */
-public class PKIXValidationOptionsTest extends BaseConfigTestCase {
-
-    /**
-     * Test configuring basic options with default values.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testDefaultValues() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/PKIXValidationOptions1.xml", });
-
-        PKIXValidationOptions pkixOptions = 
-            (PKIXValidationOptions) appContext.getBeansOfType(PKIXValidationOptions.class).values().iterator().next();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(true, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(true, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(true, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(1), pkixOptions.getDefaultVerificationDepth());
-    }
-    
-    /**
-     * Test configuring basic options with default values and xsi:type.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testDefaultValuesWithType() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/PKIXValidationOptions2.xml", });
-
-        PKIXValidationOptions pkixOptions = 
-            (PKIXValidationOptions) appContext.getBeansOfType(PKIXValidationOptions.class).values().iterator().next();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(true, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(true, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(true, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(1), pkixOptions.getDefaultVerificationDepth());
-    }
-    
-    /**
-     * Test configuring basic options with non-default values.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testNonDefaultValues() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/PKIXValidationOptions3.xml", });
-
-        PKIXValidationOptions pkixOptions = 
-            (PKIXValidationOptions) appContext.getBeansOfType(PKIXValidationOptions.class).values().iterator().next();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(false, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(false, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(false, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(3), pkixOptions.getDefaultVerificationDepth());
-    }
-
-    /**
-     * Test configuring an element with an invalid Spring configuration.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testFailedInstantiation() throws Exception {
-        String[] configs = { "/config/base-config.xml",
-                DATA_PATH + "/config/security/PKIXValidationOptions4.xml", };
-        try {
-            createSpringContext(configs);
-            fail("Spring loaded invalid configuration");
-        } catch (Exception e) {
-            // expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsTrustEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsTrustEngineTest.java.svn-base
deleted file mode 100644
index ab7108b..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptionsTrustEngineTest.java.svn-base
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import org.opensaml.xml.security.trust.TrustEngine;
-import org.opensaml.xml.security.x509.CertPathPKIXValidationOptions;
-import org.opensaml.xml.security.x509.PKIXX509CredentialTrustEngine;
-import org.opensaml.xml.signature.impl.PKIXSignatureTrustEngine;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for wiring PKIXValidationOptions into relevant trust engines is correct.
- */
-public class PKIXValidationOptionsTrustEngineTest extends BaseConfigTestCase {
-
-    /**
-     * Test the StaticPKIXSignature TrustEngine element.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testStaticSignatureEngine() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/StaticPKIXSignatureTrustEngine-Options.xml", });
-
-        TrustEngine trustEngine = (TrustEngine) appContext.getBean("StaticPKIXSignatureTrustEngine");
-        assertNotNull(trustEngine);
-        assertTrue(trustEngine instanceof PKIXSignatureTrustEngine);
-        PKIXSignatureTrustEngine pkixEngine = (PKIXSignatureTrustEngine) trustEngine;
-        
-        CertPathPKIXValidationOptions pkixOptions = 
-            (CertPathPKIXValidationOptions) pkixEngine.getPKIXTrustEvaluator().getPKIXValidationOptions();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(false, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(false, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(false, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(3), pkixOptions.getDefaultVerificationDepth());
-        assertEquals(true, pkixOptions.isForceRevocationEnabled());
-        assertEquals(false, pkixOptions.isRevocationEnabled());
-    }
-    
-    /**
-     * Test the StaticPKIXX509Credential TrustEngine element.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testStaticX509CredentialEngine() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/StaticPKIXX509CredentialTrustEngine-Options.xml", });
-
-        TrustEngine trustEngine = (TrustEngine) appContext.getBean("StaticPKIXX509CredentialTrustEngine");
-        assertNotNull(trustEngine);
-        assertTrue(trustEngine instanceof PKIXX509CredentialTrustEngine);
-        PKIXX509CredentialTrustEngine pkixEngine = (PKIXX509CredentialTrustEngine) trustEngine;
-        
-        CertPathPKIXValidationOptions pkixOptions = 
-            (CertPathPKIXValidationOptions) pkixEngine.getPKIXTrustEvaluator().getPKIXValidationOptions();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(false, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(false, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(false, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(3), pkixOptions.getDefaultVerificationDepth());
-        assertEquals(true, pkixOptions.isForceRevocationEnabled());
-        assertEquals(false, pkixOptions.isRevocationEnabled());
-    }
-    
-    /**
-     * Test the MetadataPKIXX509Credential TrustEngine element.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testMetadataX509CredentialEngine() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/MetadataPKIXTrustEngines-Options.xml", });
-
-        TrustEngine trustEngine = (TrustEngine) appContext.getBean("MetadataPKIXX509CredentialTrustEngine");
-        assertNotNull(trustEngine);
-        assertTrue(trustEngine instanceof PKIXX509CredentialTrustEngine);
-        PKIXX509CredentialTrustEngine pkixEngine = (PKIXX509CredentialTrustEngine) trustEngine;
-        
-        CertPathPKIXValidationOptions pkixOptions = 
-            (CertPathPKIXValidationOptions) pkixEngine.getPKIXTrustEvaluator().getPKIXValidationOptions();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(false, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(false, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(false, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(3), pkixOptions.getDefaultVerificationDepth());
-        assertEquals(true, pkixOptions.isForceRevocationEnabled());
-        assertEquals(false, pkixOptions.isRevocationEnabled());
-    }
-    
-    /**
-     * Test the MetadataPKIXSignature TrustEngine element.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testMetadataSignatureEngine() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/MetadataPKIXTrustEngines-Options.xml", });
-
-        TrustEngine trustEngine = (TrustEngine) appContext.getBean("MetadataPKIXSignatureTrustEngine");
-        assertNotNull(trustEngine);
-        assertTrue(trustEngine instanceof PKIXSignatureTrustEngine);
-        PKIXSignatureTrustEngine pkixEngine = (PKIXSignatureTrustEngine) trustEngine;
-        
-        CertPathPKIXValidationOptions pkixOptions = 
-            (CertPathPKIXValidationOptions) pkixEngine.getPKIXTrustEvaluator().getPKIXValidationOptions();
-        assertNotNull(pkixOptions);
-        
-        assertEquals(false, pkixOptions.isProcessEmptyCRLs());
-        assertEquals(false, pkixOptions.isProcessExpiredCRLs());
-        assertEquals(false, pkixOptions.isProcessCredentialCRLs());
-        assertEquals(new Integer(3), pkixOptions.getDefaultVerificationDepth());
-        assertEquals(true, pkixOptions.isForceRevocationEnabled());
-        assertEquals(false, pkixOptions.isRevocationEnabled());
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineTest.java.svn-base
deleted file mode 100644
index 645f5fd..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngineTest.java.svn-base
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.opensaml.xml.security.CriteriaSet;
-import org.opensaml.xml.security.trust.TrustEngine;
-import org.opensaml.xml.security.x509.PKIXValidationInformation;
-import org.opensaml.xml.security.x509.StaticPKIXValidationInformationResolver;
-import org.opensaml.xml.signature.impl.PKIXSignatureTrustEngine;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for static PKIX signature trust engine works correctly.
- */
-public class StaticPKIXSignatureTrustEngineTest extends BaseConfigTestCase {
-
-    /**
-     * Test configuring a trust engine with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testBasicInstantiation() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/StaticPKIXSignatureTrustEngine1.xml", });
-
-        TrustEngine trustEngine = (TrustEngine) appContext.getBean("StaticPKIXSignatureTrustEngine");
-        assertNotNull(trustEngine);
-        assertTrue(trustEngine instanceof PKIXSignatureTrustEngine);
-        PKIXSignatureTrustEngine pkixEngine = (PKIXSignatureTrustEngine) trustEngine;
-        
-        CriteriaSet criteriaSet = new CriteriaSet();
-        StaticPKIXValidationInformationResolver resolver = (StaticPKIXValidationInformationResolver)pkixEngine.getPKIXResolver();
-        Set<String> trustedNames = resolver.resolveTrustedNames(criteriaSet);
-        
-        assertEquals("Incorrect number of trusted names", 3, trustedNames.size());
-        assertTrue("Missing expected trusted name", trustedNames.contains("FOO"));
-        assertTrue("Missing expected trusted name", trustedNames.contains("BAR"));
-        assertTrue("Missing expected trusted name", trustedNames.contains("BAZ"));
-        
-        Iterator<PKIXValidationInformation> pkixIter = resolver.resolve(criteriaSet).iterator();
-        assertTrue(pkixIter.hasNext());
-        PKIXValidationInformation pkixInfoSet = pkixIter.next();
-        assertEquals("Incorrect number of certs", 1, pkixInfoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRLs", 0, pkixInfoSet.getCRLs().size());
-        assertEquals("Incorrect verify depth", new Integer(5), pkixInfoSet.getVerificationDepth());
-        assertFalse("Too many PKIX validation info sets", pkixIter.hasNext());
-    }
-
-    /**
-     * Test configuring a trust engine with an invalid Spring configuration.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testFailedInstantiation() throws Exception {
-        String[] configs = { "/config/base-config.xml",
-                DATA_PATH + "/config/security/StaticPKIXSignatureTrustEngine2.xml", };
-        try {
-            createSpringContext(configs);
-            fail("Spring loaded invalid configuration");
-        } catch (Exception e) {
-            // expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineTest.java.svn-base
deleted file mode 100644
index 8dcb411..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngineTest.java.svn-base
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.config.security;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.opensaml.xml.security.CriteriaSet;
-import org.opensaml.xml.security.trust.TrustEngine;
-import org.opensaml.xml.security.x509.PKIXValidationInformation;
-import org.opensaml.xml.security.x509.PKIXX509CredentialTrustEngine;
-import org.opensaml.xml.security.x509.StaticPKIXValidationInformationResolver;
-import org.springframework.context.ApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.config.BaseConfigTestCase;
-
-/**
- * Test that the configuration code for static PKIX X509 credential trust engine works correctly.
- */
-public class StaticPKIXX509CredentialTrustEngineTest extends BaseConfigTestCase {
-
-    /**
-     * Test configuring a trust engine with Spring.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testBasicInstantiation() throws Exception {
-        ApplicationContext appContext = createSpringContext(new String[] { DATA_PATH + "/config/base-config.xml",
-                DATA_PATH + "/config/security/StaticPKIXX509CredentialTrustEngine1.xml", });
-
-        TrustEngine trustEngine = (TrustEngine) appContext.getBean("StaticPKIXX509CredentialTrustEngine");
-        assertNotNull(trustEngine);
-        assertTrue(trustEngine instanceof PKIXX509CredentialTrustEngine);
-        PKIXX509CredentialTrustEngine pkixEngine = (PKIXX509CredentialTrustEngine) trustEngine;
-        
-        CriteriaSet criteriaSet = new CriteriaSet();
-        StaticPKIXValidationInformationResolver resolver = (StaticPKIXValidationInformationResolver)pkixEngine.getPKIXResolver();
-        Set<String> trustedNames = resolver.resolveTrustedNames(criteriaSet);
-        
-        assertEquals("Incorrect number of trusted names", 3, trustedNames.size());
-        assertTrue("Missing expected trusted name", trustedNames.contains("FOO"));
-        assertTrue("Missing expected trusted name", trustedNames.contains("BAR"));
-        assertTrue("Missing expected trusted name", trustedNames.contains("BAZ"));
-        
-        Iterator<PKIXValidationInformation> pkixIter = resolver.resolve(criteriaSet).iterator();
-        assertTrue(pkixIter.hasNext());
-        PKIXValidationInformation pkixInfoSet = pkixIter.next();
-        assertEquals("Incorrect number of certs", 1, pkixInfoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRLs", 0, pkixInfoSet.getCRLs().size());
-        assertEquals("Incorrect verify depth", new Integer(5), pkixInfoSet.getVerificationDepth());
-        assertFalse("Too many PKIX validation info sets", pkixIter.hasNext());
-    }
-
-    /**
-     * Test configuring a trust engine with an invalid Spring configuration.
-     * 
-     * @throws Exception thrown if there is a problem
-     */
-    public void testFailedInstantiation() throws Exception {
-        String[] configs = { "/config/base-config.xml",
-                DATA_PATH + "/config/security/StaticPKIXX509CredentialTrustEngine2.xml", };
-        try {
-            createSpringContext(configs);
-            fail("Spring loaded invalid configuration");
-        } catch (Exception e) {
-            // expected
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/all-wcprops
deleted file mode 100644
index 04c9cfd..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 112
-/java-shib-common/!svn/ver/1033/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/resource
-END
-SVNResourceTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/1033/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/resource/SVNResourceTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/entries
deleted file mode 100644
index 045110b..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/resource
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2012-08-10T22:13:47.263439Z
-1033
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-SVNResourceTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.766719Z
-cd9a806465764174e54d3f3ad059e342
-2012-08-10T22:13:47.263439Z
-1033
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5713
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNResourceTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNResourceTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/prop-base/SVNResourceTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNResourceTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNResourceTest.java.svn-base
deleted file mode 100644
index 8283c40..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/resource/.svn/text-base/SVNResourceTest.java.svn-base
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.resource;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import org.joda.time.DateTime;
-import org.tmatesoft.svn.core.SVNDepth;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
-import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-
-/** Unit test for {@link SVNResource }. */
-public class SVNResourceTest extends TestCase {
-
-    private SVNClientManager clientManager;
-
-    private File repoDir;
-
-    private File workingCopyDirectory;
-
-    private File altWorkingCopyDirectory;
-
-    private String schemaFileName;
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        FSRepositoryFactory.setup();
-        clientManager = SVNClientManager.newInstance();
-
-        repoDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "svnrepo");
-        SVNURL repoUrl = SVNRepositoryFactory.createLocalRepository(repoDir, false, true);
-        File schemaDir = new File(SVNResourceTest.class.getResource("/schema").toURI());
-        clientManager.getCommitClient().doImport(schemaDir, repoUrl, null, null, false, false, SVNDepth.INFINITY);
-
-        altWorkingCopyDirectory = new File(System.getProperty("java.io.tmpdir") + File.separator + "svnaltwc");
-        clientManager.getUpdateClient().doCheckout(repoUrl, altWorkingCopyDirectory, SVNRevision.HEAD,
-                SVNRevision.HEAD, SVNDepth.INFINITY, true);
-
-        workingCopyDirectory = new File(System.getProperty("java.io.tmpdir") + File.separator + "svnwc");
-
-        schemaFileName = "shibboleth-2.0-resource.xsd";
-    }
-
-    /** {@inheritDoc} */
-    protected void tearDown() throws Exception {
-        deleteDirectory(workingCopyDirectory);
-        deleteDirectory(altWorkingCopyDirectory);
-        deleteDirectory(repoDir);
-    }
-
-    public void test() throws Exception {
-        SVNURL svnurl = SVNURL.parseURIDecoded("file://" + repoDir.getAbsolutePath());
-        File schemaFile = new File(workingCopyDirectory, schemaFileName);
-
-        SVNResource resource = new SVNResource(clientManager, svnurl, workingCopyDirectory, -1, schemaFileName);
-
-        // directory should contain the 19 schema files plus the .svn directory
-        assertEquals(20, workingCopyDirectory.list().length);
-        assertTrue(schemaFile.exists());
-        assertEquals(5148, schemaFile.length());
-        assertTrue(resource.exists());
-        assertEquals("file://" + repoDir.getAbsolutePath() + "/" + schemaFileName, resource.getLocation());
-
-        DateTime lastModified = resource.getLastModifiedTime();
-        assertTrue(lastModified.isBeforeNow());
-
-        modifySchemaFile(16);
-
-        // exist() and getLocation() should not force an update
-        assertTrue(resource.exists());
-        assertEquals("file://" + repoDir.getAbsolutePath() + "/" + schemaFileName, resource.getLocation());
-        assertEquals(20, workingCopyDirectory.list().length);
-        assertTrue(schemaFile.exists());
-        assertEquals(5148, schemaFile.length());
-
-        // getLastModified() should force an update
-        assertTrue(lastModified.isBefore(resource.getLastModifiedTime()));
-        assertEquals(20, workingCopyDirectory.list().length);
-        assertTrue(schemaFile.exists());
-        assertEquals(16, schemaFile.length());
-
-        modifySchemaFile(32);
-
-        // getInputStream() should force an update
-        assertTrue(lastModified.isBefore(resource.getLastModifiedTime()));
-        assertEquals(20, workingCopyDirectory.list().length);
-        assertTrue(schemaFile.exists());
-        assertEquals(32, schemaFile.length());
-    }
-
-    private void modifySchemaFile(int numOfRandomBytes) throws Exception {
-        Random randomGen = new Random();
-        byte[] randomBytes = new byte[numOfRandomBytes];
-        randomGen.nextBytes(randomBytes);
-
-        File schemaFile = new File(altWorkingCopyDirectory, schemaFileName);
-        FileOutputStream out = new FileOutputStream(schemaFile);
-        out.write(randomBytes);
-        out.flush();
-        out.close();
-
-        clientManager.getCommitClient().doCommit(new File[] { schemaFile }, false, null, null, null, false, false,
-                SVNDepth.FILES);
-    }
-
-    /**
-     * Used to recursively delete a directory.
-     * 
-     * @param directory directory to be deleted
-     */
-    private void deleteDirectory(File directory) throws Exception {
-        File[] files = directory.listFiles();
-        for (File file : files) {
-            if (file.isDirectory()) {
-                deleteDirectory(file);
-            } else {
-                file.delete();
-            }
-        }
-
-        directory.delete();
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops
deleted file mode 100644
index bcadd91..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 111
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/security
-END
-MetadataPKIXValidationInformationResolverTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/security/MetadataPKIXValidationInformationResolverTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/entries
deleted file mode 100644
index 28557d8..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-MetadataPKIXValidationInformationResolverTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.774720Z
-b7afef3574f1195dd12b678a1356769b
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-17263
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/MetadataPKIXValidationInformationResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/MetadataPKIXValidationInformationResolverTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/MetadataPKIXValidationInformationResolverTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/MetadataPKIXValidationInformationResolverTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/MetadataPKIXValidationInformationResolverTest.java.svn-base
deleted file mode 100644
index f56a571..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/MetadataPKIXValidationInformationResolverTest.java.svn-base
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.security;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.opensaml.saml2.metadata.IDPSSODescriptor;
-import org.opensaml.saml2.metadata.SPSSODescriptor;
-import org.opensaml.saml2.metadata.provider.DOMMetadataProvider;
-import org.opensaml.saml2.metadata.provider.MetadataProviderException;
-import org.opensaml.security.MetadataCriteria;
-import org.opensaml.xml.parse.BasicParserPool;
-import org.opensaml.xml.parse.XMLParserException;
-import org.opensaml.xml.security.CriteriaSet;
-import org.opensaml.xml.security.SecurityException;
-import org.opensaml.xml.security.credential.UsageType;
-import org.opensaml.xml.security.criteria.EntityIDCriteria;
-import org.opensaml.xml.security.criteria.UsageCriteria;
-import org.opensaml.xml.security.x509.PKIXValidationInformation;
-import org.w3c.dom.Document;
-
-import edu.internet2.middleware.shibboleth.common.TestCaseBase;
-
-/**
- * Testing the Shibboleth metadata PKIX validation information resolver.
- */
-public class MetadataPKIXValidationInformationResolverTest extends TestCaseBase {
-    
-    private String protocolBlue = "PROTOCOL_BLUE";
-    
-    private String protocolGreen = "PROTOCOL_GREEN";
-    
-    private String fooEntityID = "http://foo.example.org/shibboleth";
-    
-    private String barEntityID = "http://bar.example.org/shibboleth";
-    
-    private BasicParserPool parserPool;
-    
-    private CriteriaSet criteriaSet;
-    
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-        parserPool = new BasicParserPool();
-        criteriaSet = new CriteriaSet();
-    }
-    
-    public void testEmpty() {
-       MetadataPKIXValidationInformationResolver resolver = getResolver("empty-metadata-pkix.xml");
-       criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-       criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-       criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-       
-       Iterator<PKIXValidationInformation> iter = null;
-       try {
-           iter = resolver.resolve(criteriaSet).iterator();
-       } catch (SecurityException e) {
-           fail("Error resolving from PKIX resolver: " + e.getMessage());
-       }
-       
-       assertFalse("Iterator was not empty", iter.hasNext());
-    }
-    
-    public void testNames() {
-        MetadataPKIXValidationInformationResolver resolver = getResolver("names-entities-metadata-pkix.xml");
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-        
-        Set<String> names = null;
-        try {
-            names = resolver.resolveTrustedNames(criteriaSet);
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        assertNotNull("Set of resolved trusted names was null", names);
-        assertFalse("Set of trusted names was empty", names.isEmpty());
-        assertEquals("Set of trusted names had incorrect size", 1, names.size());
-        assertTrue("Did't find expected name value", names.contains("foo.example.org"));
-        
-        criteriaSet.clear();
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolGreen) );
-        
-        try {
-            names = resolver.resolveTrustedNames(criteriaSet);
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        assertNotNull("Set of resolved trusted names was null", names);
-        assertFalse("Set of trusted names was empty", names.isEmpty());
-        assertEquals("Set of trusted names had incorrect size", 2, names.size());
-        assertTrue("Did't find expected name value", names.contains("CN=foo.example.org,O=Internet2"));
-        assertTrue("Did't find expected name value", names.contains("idp.example.org"));
-        
-        criteriaSet.clear();
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria(barEntityID) );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-        
-        try {
-            names = resolver.resolveTrustedNames(criteriaSet);
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        assertNotNull("Set of resolved trusted names was null", names);
-        assertTrue("Set of trusted names was not empty", names.isEmpty());
-     }
-    
-    public void testNonExistentEntityID() {
-        MetadataPKIXValidationInformationResolver resolver = getResolver("oneset-entities-metadata-pkix.xml");
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria("http://doesnt.exist.example.org/shibboleth") );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-        
-        Iterator<PKIXValidationInformation> iter = null;
-        try {
-            iter = resolver.resolve(criteriaSet).iterator();
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        assertFalse("Iterator was not empty", iter.hasNext());
-     }
-    
-    public void testOneSetOnEntitiesDescriptor() {
-       MetadataPKIXValidationInformationResolver resolver = getResolver("oneset-entities-metadata-pkix.xml");
-       criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-       criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-       criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-       
-       Iterator<PKIXValidationInformation> iter = null;
-       try {
-           iter = resolver.resolve(criteriaSet).iterator();
-       } catch (SecurityException e) {
-           fail("Error resolving from PKIX resolver: " + e.getMessage());
-       }
-       
-       PKIXValidationInformation infoSet = null;
-       assertTrue("Iterator was empty", iter.hasNext());
-       infoSet = iter.next();
-       assertEquals("Incorrect number of certificates", 3, infoSet.getCertificates().size());
-       assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-       assertEquals("Incorrect VerifyDepth", new Integer(5), infoSet.getVerificationDepth());
-       
-       assertFalse("Iterator was not empty", iter.hasNext());
-    }
-    
-    public void testNoVerifyDepth() {
-       MetadataPKIXValidationInformationResolver resolver = getResolver("nodepth-entities-metadata-pkix.xml");
-       criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-       criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-       criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-       
-       Iterator<PKIXValidationInformation> iter = null;
-       try {
-           iter = resolver.resolve(criteriaSet).iterator();
-       } catch (SecurityException e) {
-           fail("Error resolving from PKIX resolver: " + e.getMessage());
-       }
-       
-       PKIXValidationInformation infoSet = null;
-       assertTrue("Iterator was empty", iter.hasNext());
-       infoSet = iter.next();
-       // 1 is the default VerifyDepth value
-       assertEquals("Incorrect VerifyDepth", new Integer(1), infoSet.getVerificationDepth());
-       
-       assertFalse("Iterator was not empty", iter.hasNext());
-    }
-    
-    public void testOneSetOnEntitiesDescriptor3KeyInfo() {
-        MetadataPKIXValidationInformationResolver resolver = getResolver("oneset-3keyinfo-metadata-pkix.xml");
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-        
-        Iterator<PKIXValidationInformation> iter = null;
-        try {
-            iter = resolver.resolve(criteriaSet).iterator();
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        PKIXValidationInformation infoSet = null;
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 7, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 2, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(5), infoSet.getVerificationDepth());
-        
-        assertFalse("Iterator was not empty", iter.hasNext());
-     }
-    
-    public void testOneSetOnEntityDescriptor() {
-       MetadataPKIXValidationInformationResolver resolver = getResolver("oneset-entity-metadata-pkix.xml");
-       criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-       criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-       criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-       
-       Iterator<PKIXValidationInformation> iter = null;
-       try {
-           iter = resolver.resolve(criteriaSet).iterator();
-       } catch (SecurityException e) {
-           fail("Error resolving from PKIX resolver: " + e.getMessage());
-       }
-       
-       PKIXValidationInformation infoSet = null;
-       assertTrue("Iterator was empty", iter.hasNext());
-       infoSet = iter.next();
-       assertEquals("Incorrect number of certificates", 3, infoSet.getCertificates().size());
-       assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-       assertEquals("Incorrect VerifyDepth", new Integer(5), infoSet.getVerificationDepth());
-       
-       assertFalse("Iterator was not empty", iter.hasNext());
-       
-       // Now check other entity ID resolves as empty
-       criteriaSet.clear();
-       criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-       criteriaSet.add( new EntityIDCriteria(barEntityID) );
-       criteriaSet.add( new MetadataCriteria(SPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-       
-       try {
-           iter = resolver.resolve(criteriaSet).iterator();
-       } catch (SecurityException e) {
-           fail("Error resolving from PKIX resolver: " + e.getMessage());
-       }
-       
-       assertFalse("Iterator was not empty", iter.hasNext());
-    }
-    
-    public void testTwoSetOnEntitiesAndEntityDescriptor() {
-        MetadataPKIXValidationInformationResolver resolver = getResolver("twoset-entity-entities-metadata-pkix.xml");
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-        
-        Iterator<PKIXValidationInformation> iter = null;
-        try {
-            iter = resolver.resolve(criteriaSet).iterator();
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        PKIXValidationInformation infoSet = null;
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 1, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(3), infoSet.getVerificationDepth());
-        
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 6, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(5), infoSet.getVerificationDepth());
-        
-        assertFalse("Iterator was not empty", iter.hasNext());
-     }
-    
-    public void testTwoSetOn2Authorities() {
-        MetadataPKIXValidationInformationResolver resolver = getResolver("twoset-2authorities-entities-metadata-pkix.xml");
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-        
-        Iterator<PKIXValidationInformation> iter = null;
-        try {
-            iter = resolver.resolve(criteriaSet).iterator();
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        PKIXValidationInformation infoSet = null;
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 3, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(5), infoSet.getVerificationDepth());
-        
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 1, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(3), infoSet.getVerificationDepth());
-        
-        
-        assertFalse("Iterator was not empty", iter.hasNext());
-    }
-    
-    public void testThreeSetOn3Authorities() {
-        MetadataPKIXValidationInformationResolver resolver = getResolver("threeset-entity-entities-entities-metadata-pkix.xml");
-        criteriaSet.add( new UsageCriteria(UsageType.SIGNING) );
-        criteriaSet.add( new EntityIDCriteria(fooEntityID) );
-        criteriaSet.add( new MetadataCriteria(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, protocolBlue) );
-        
-        Iterator<PKIXValidationInformation> iter = null;
-        try {
-            iter = resolver.resolve(criteriaSet).iterator();
-        } catch (SecurityException e) {
-            fail("Error resolving from PKIX resolver: " + e.getMessage());
-        }
-        
-        PKIXValidationInformation infoSet = null;
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 1, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(3), infoSet.getVerificationDepth());
-        
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 3, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 0, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(5), infoSet.getVerificationDepth());
-        
-        assertTrue("Iterator was empty", iter.hasNext());
-        infoSet = iter.next();
-        assertEquals("Incorrect number of certificates", 4, infoSet.getCertificates().size());
-        assertEquals("Incorrect number of CRL's", 1, infoSet.getCRLs().size());
-        assertEquals("Incorrect VerifyDepth", new Integer(5), infoSet.getVerificationDepth());
-        
-        assertFalse("Iterator was not empty", iter.hasNext());
-     } 
-    
-    private MetadataPKIXValidationInformationResolver getResolver(String fileName) {
-        Document mdDoc = null;
-        String mdFileName = DATA_PATH + "/security/" + fileName;
-        try {
-            mdDoc = parserPool.parse(MetadataPKIXValidationInformationResolverTest.class.getResourceAsStream(mdFileName));
-        } catch (XMLParserException e) {
-            fail("Failed to parse metadata document: " + e.getMessage());
-        }
-        
-        DOMMetadataProvider mdProvider = new DOMMetadataProvider(mdDoc.getDocumentElement());
-        try {
-            mdProvider.initialize();
-        } catch (MetadataProviderException e) {
-            fail("Failed to initialize metadata provider");
-        }
-        
-        return new MetadataPKIXValidationInformationResolver(mdProvider);
-    }
-
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/all-wcprops
deleted file mode 100644
index 8564f42..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 107
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/util
-END
-EventingMapBasedStorageServiceTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 147
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/util/EventingMapBasedStorageServiceTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/entries
deleted file mode 100644
index 565874c..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/util
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-EventingMapBasedStorageServiceTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.862721Z
-6dc28dc76653dab0596a45ad348236e3
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5193
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/EventingMapBasedStorageServiceTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/EventingMapBasedStorageServiceTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/prop-base/EventingMapBasedStorageServiceTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/EventingMapBasedStorageServiceTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/EventingMapBasedStorageServiceTest.java.svn-base
deleted file mode 100644
index 2fe8468..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/util/.svn/text-base/EventingMapBasedStorageServiceTest.java.svn-base
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.util;
-
-import java.util.Iterator;
-
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.support.GenericApplicationContext;
-
-import edu.internet2.middleware.shibboleth.common.TestCaseBase;
-import edu.internet2.middleware.shibboleth.common.util.EventingMapBasedStorageService.AddEntryEvent;
-import edu.internet2.middleware.shibboleth.common.util.EventingMapBasedStorageService.RemoveEntryEvent;
-
-/**
- * 
- */
-public class EventingMapBasedStorageServiceTest extends TestCaseBase {
-    
-    public void testStorageService() {
-        AddEntryListener addListener = new AddEntryListener();
-        RemoveEntryListener removeListener = new RemoveEntryListener();
-
-        GenericApplicationContext appCtx = new GenericApplicationContext();
-        EventingMapBasedStorageService<String, String> storageService = new EventingMapBasedStorageService<String, String>();
-        storageService.setApplicationContext(appCtx);
-        appCtx.addApplicationListener(addListener);
-        appCtx.addApplicationListener(removeListener);
-        appCtx.refresh();
-
-        String partition = "partition";
-        String value = "value";
-
-        String key1 = "string1";
-        storageService.put(partition, key1, value);
-
-        String key2 = "string2";
-        storageService.put(partition, key2, value);
-
-        String key3 = "string3";
-        storageService.put(partition, key3, value);
-
-        String key4 = "string4";
-        storageService.put(partition, key4, value);
-
-        String key5 = "string5";
-        storageService.put(partition, key5, value);
-
-        assertEquals(5, addListener.getCount());
-        assertEquals(0, removeListener.getCount());
-        assertEquals(true, storageService.contains(partition, key1));
-        assertEquals(true, storageService.contains(partition, key2));
-        assertEquals(true, storageService.contains(partition, key3));
-        assertEquals(true, storageService.contains(partition, key4));
-        assertEquals(true, storageService.contains(partition, key5));
-
-        storageService.remove(partition, key1);
-        assertEquals(5, addListener.getCount());
-        assertEquals(1, removeListener.getCount());
-        assertEquals(false, storageService.contains(partition, key1));
-        assertEquals(true, storageService.contains(partition, key2));
-        assertEquals(true, storageService.contains(partition, key3));
-        assertEquals(true, storageService.contains(partition, key4));
-        assertEquals(true, storageService.contains(partition, key5));
-
-        Iterator<String> keysItr = storageService.getKeys(partition);
-        keysItr.next();
-        keysItr.remove();
-        assertEquals(5, addListener.getCount());
-        assertEquals(2, removeListener.getCount());
-
-        Iterator<String> partiationsItr = storageService.getPartitions();
-        partiationsItr.next();
-        partiationsItr.remove();
-        assertEquals(5, addListener.getCount());
-        assertEquals(5, removeListener.getCount());
-        assertEquals(false, storageService.contains(partition, key1));
-        assertEquals(false, storageService.contains(partition, key2));
-        assertEquals(false, storageService.contains(partition, key3));
-        assertEquals(false, storageService.contains(partition, key4));
-        assertEquals(false, storageService.contains(partition, key5));
-    }
-
-    public class AddEntryListener implements ApplicationListener {
-
-        private int count;
-
-        public AddEntryListener() {
-            count = 0;
-        }
-
-        /** {@inheritDoc} */
-        public void onApplicationEvent(ApplicationEvent event) {
-            if (event instanceof AddEntryEvent) {
-                count++;
-            }
-        }
-
-        public int getCount() {
-            return count;
-        }
-    }
-
-    public class RemoveEntryListener implements ApplicationListener {
-
-        private int count;
-
-        public RemoveEntryListener() {
-            count = 0;
-        }
-
-        /** {@inheritDoc} */
-        public void onApplicationEvent(ApplicationEvent event) {
-            if (event instanceof RemoveEntryEvent) {
-                count++;
-            }
-        }
-
-        public int getCount() {
-            return count;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops
deleted file mode 100644
index 6273340..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 112
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject
-END
-BaseShibObjectProviderTestCase.java
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/BaseShibObjectProviderTestCase.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries
deleted file mode 100644
index a28b266..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries
+++ /dev/null
@@ -1,65 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-BaseShibObjectProviderTestCase.java
-file
-
-
-
-
-2014-02-19T17:27:39.854721Z
-904af5f0bfdb09fdbb56508520b1e06f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5006
-

-impl
-dir
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/BaseShibObjectProviderTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/BaseShibObjectProviderTestCase.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/prop-base/BaseShibObjectProviderTestCase.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/BaseShibObjectProviderTestCase.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/BaseShibObjectProviderTestCase.java.svn-base
deleted file mode 100644
index 2e756d4..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/text-base/BaseShibObjectProviderTestCase.java.svn-base
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.Configuration;
-import org.opensaml.xml.XMLObject;
-import org.opensaml.xml.XMLObjectBuilder;
-import org.w3c.dom.Document;
-
-import edu.internet2.middleware.shibboleth.common.TestCaseBase;
-
-/**
- * Base abstract class for testing object providers.
- */
-public abstract class BaseShibObjectProviderTestCase extends TestCaseBase {
-
-    /** Base path for data files. */
-    public static final String DATA_PATH = "/data/edu/internet2/middleware/shibboleth/common/xmlobject";
-
-    /** Location of file containing a single element with NO optional attributes. */
-    protected String singleElementFile;
-
-    /** Location of file containing a single element with all optional attributes. */
-    protected String singleElementOptionalAttributesFile;
-
-    /** Location of file containing a single element with child elements. */
-    protected String childElementsFile;
-
-    /** The expected result of a marshalled single element with no optional attributes. */
-    protected Document expectedDOM;
-
-    /** The expected result of a marshalled single element with all optional attributes. */
-    protected Document expectedOptionalAttributesDOM;
-
-    /** The expected result of a marshalled single element with child elements. */
-    protected Document expectedChildElementsDOM;
-
-    /**
-     * Builds the requested XMLObject.
-     * 
-     * @param objectQName name of the XMLObject
-     * 
-     * @return the build XMLObject
-     */
-    public XMLObject buildXMLObject(QName objectQName) {
-        XMLObjectBuilder builder = Configuration.getBuilderFactory().getBuilder(objectQName);
-        if (builder == null) {
-            fail("Unable to retrieve builder for object QName " + objectQName);
-        }
-        return builder.buildObject(objectQName.getNamespaceURI(), objectQName.getLocalPart(), objectQName.getPrefix());
-    }
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        if (singleElementFile != null) {
-            expectedDOM = parser.parse(BaseShibObjectProviderTestCase.class.getResourceAsStream(singleElementFile));
-        }
-
-        if (singleElementOptionalAttributesFile != null) {
-            expectedOptionalAttributesDOM = parser.parse(BaseShibObjectProviderTestCase.class
-                    .getResourceAsStream(singleElementOptionalAttributesFile));
-        }
-
-        if (childElementsFile != null) {
-            expectedChildElementsDOM = parser.parse(BaseShibObjectProviderTestCase.class
-                    .getResourceAsStream(childElementsFile));
-        }
-    }
-
-    /**
-     * Tests marshalling the contents of a single element with child elements to a DOM document.
-     */
-    public void testChildElementsMarshall() {
-        assertNull("No testSingleElementChildElementsMarshall", expectedChildElementsDOM);
-    }
-
-    /**
-     * Tests unmarshalling a document that contains a single element with children.
-     */
-    public void testChildElementsUnmarshall() {
-        assertNull("No testSingleElementChildElementsUnmarshall present", childElementsFile);
-    }
-
-    /**
-     * Tests marshalling the contents of a single element, with no optional attributes, to a DOM document.
-     */
-    public abstract void testSingleElementMarshall();
-
-    /**
-     * Tests marshalling the contents of a single element, with all optional attributes, to a DOM document.
-     */
-    public void testSingleElementOptionalAttributesMarshall() {
-        assertNull("No testSingleElementOptionalAttributesMarshall", expectedOptionalAttributesDOM);
-    }
-
-    /**
-     * Tests unmarshalling a document that contains a single element (no children) with all that element's optional
-     * attributes.
-     */
-    public void testSingleElementOptionalAttributesUnmarshall() {
-        assertNull("No testSingleElementOptionalAttributesUnmarshall present", singleElementOptionalAttributesFile);
-    }
-
-    /**
-     * Tests unmarshalling a document that contains a single element (no children) with no optional attributes.
-     */
-    public abstract void testSingleElementUnmarshall();
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops
deleted file mode 100644
index 9e5fecb..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 117
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl
-END
-ShibMDKeyAuthorityTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 145
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibMDKeyAuthorityTest.java
-END
-ShibMDScopeTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 138
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibMDScopeTest.java
-END
-ShibScopedValueTest.java
-K 25
-svn:wc:ra_dav:version-url
-V 142
-/java-shib-common/!svn/ver/982/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibScopedValueTest.java
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries
deleted file mode 100644
index d253747..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries
+++ /dev/null
@@ -1,130 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibMDKeyAuthorityTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.854721Z
-2cfa6e43b9dee2070075d036cbaef12f
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5759
-

-ShibMDScopeTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.854721Z
-0b7fc0624d8d5f84e823029e708e7bcd
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4906
-

-ShibScopedValueTest.java
-file
-
-
-
-
-2014-02-19T17:27:39.854721Z
-b11b33321767be543d39153dd04eac8e
-2011-06-17T20:07:39.642965Z
-982
-putmanb
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3594
-

diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScopeTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScopeTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScopeTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValueTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValueTest.java.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValueTest.java.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityTest.java.svn-base
deleted file mode 100644
index aa0a624..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityTest.java.svn-base
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import javax.xml.namespace.QName;
-
-import org.opensaml.xml.signature.KeyInfo;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.BaseShibObjectProviderTestCase;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataKeyAuthority;
-
-/**
- * Testing shibmd:KeyAuthority metadata extension.
- */
-public class ShibMDKeyAuthorityTest extends BaseShibObjectProviderTestCase {
-    
-    private Integer expectedVerifyDepth;
-    private int expectedNumKeyInfos;
-    
-    private QName unknownAttribName;
-    private String unknownAttribValue;
-    
-    /** Constructor. */
-    public ShibMDKeyAuthorityTest() {
-        singleElementFile = DATA_PATH + "/impl/ShibMDKeyAuthority.xml";
-        singleElementOptionalAttributesFile = DATA_PATH + "/impl/ShibMDKeyAuthorityOptionalAttributes.xml";
-        childElementsFile = DATA_PATH + "/impl/ShibMDKeyAuthorityChildElements.xml";
-    }
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        expectedVerifyDepth = new Integer(5);
-        expectedNumKeyInfos  = 4;
-        
-        unknownAttribName = new QName("http://www.example.org/testObjects", "UnknownAttrib", "test");
-        unknownAttribValue = "FooBar";
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementMarshall() {
-        ShibbolethMetadataKeyAuthority keyAuthority = 
-            (ShibbolethMetadataKeyAuthority) buildXMLObject(ShibbolethMetadataKeyAuthority.DEFAULT_ELEMENT_NAME);
-        
-        assertEquals(expectedDOM, keyAuthority);
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementOptionalAttributesMarshall() {
-        ShibbolethMetadataKeyAuthority keyAuthority = 
-            (ShibbolethMetadataKeyAuthority) buildXMLObject(ShibbolethMetadataKeyAuthority.DEFAULT_ELEMENT_NAME);
-        
-        keyAuthority.setVerifyDepth(expectedVerifyDepth);
-        keyAuthority.getUnknownAttributes().put(unknownAttribName, unknownAttribValue);
-        
-        assertEquals(expectedOptionalAttributesDOM, keyAuthority);
-    }
-    
-    /** {@inheritDoc} */
-    public void testChildElementsMarshall() {
-        ShibbolethMetadataKeyAuthority keyAuthority = 
-            (ShibbolethMetadataKeyAuthority) buildXMLObject(ShibbolethMetadataKeyAuthority.DEFAULT_ELEMENT_NAME);
-        
-        for (int i = 0; i< expectedNumKeyInfos; i++) {
-            keyAuthority.getKeyInfos().add( (KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME)  );
-        }
-        
-        assertEquals(expectedChildElementsDOM, keyAuthority);
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementUnmarshall() {
-        ShibbolethMetadataKeyAuthority keyAuthority = 
-            (ShibbolethMetadataKeyAuthority) unmarshallElement(singleElementFile);
-        
-        assertNotNull("Unmarshalled object was null", keyAuthority);
-        assertNull("VerifyDepth attribute value", keyAuthority.getVerifyDepth());
-        
-        assertTrue("Extension attribute map was not empty", keyAuthority.getUnknownAttributes().isEmpty());
-        
-        assertTrue("KeyInfo list was not empty", keyAuthority.getKeyInfos().isEmpty());
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementOptionalAttributesUnmarshall() {
-        ShibbolethMetadataKeyAuthority keyAuthority = 
-            (ShibbolethMetadataKeyAuthority) unmarshallElement(singleElementOptionalAttributesFile);
-        
-        assertNotNull("Unmarshalled object was null", keyAuthority);
-        assertEquals("VerifyDepth attribute value", expectedVerifyDepth, keyAuthority.getVerifyDepth());
-        
-        assertFalse("Extension attribute map was empty", keyAuthority.getUnknownAttributes().isEmpty());
-        assertTrue("AttributeMap did not contain expected unknown attribute name", 
-                keyAuthority.getUnknownAttributes().containsKey(unknownAttribName));
-        assertEquals("AttributeMap did not contain expected unknown attribute value", unknownAttribValue,
-                keyAuthority.getUnknownAttributes().get(unknownAttribName));
-        
-        assertTrue("KeyInfo list was not empty", keyAuthority.getKeyInfos().isEmpty());
-        
-    }
-
-    /** {@inheritDoc} */
-    public void testChildElementsUnmarshall() {
-        ShibbolethMetadataKeyAuthority keyAuthority = 
-            (ShibbolethMetadataKeyAuthority) unmarshallElement(childElementsFile);
-        
-        assertNotNull("Unmarshalled object was null", keyAuthority);
-        assertNull("VerifyDepth attribute value", keyAuthority.getVerifyDepth());
-        
-        assertTrue("Extension attribute map was not empty", keyAuthority.getUnknownAttributes().isEmpty());
-        
-        assertFalse("KeyInfo list was empty", keyAuthority.getKeyInfos().isEmpty());
-        assertEquals("# of KeyInfo child elements", expectedNumKeyInfos, keyAuthority.getKeyInfos().size());
-    }
- 
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScopeTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScopeTest.java.svn-base
deleted file mode 100644
index c88ea7f..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScopeTest.java.svn-base
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import org.opensaml.xml.schema.XSBooleanValue;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.BaseShibObjectProviderTestCase;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethMetadataScope;
-
-/**
- * Testing shibmd:Scope metadata extension.
- */
-public class ShibMDScopeTest extends BaseShibObjectProviderTestCase {
-    
-    private String expectedContent;
-    private Boolean expectedRegexp;
-    
-    /** Constructor. */
-    public ShibMDScopeTest() {
-        singleElementFile = DATA_PATH + "/impl/ShibMDScope.xml";
-        singleElementOptionalAttributesFile = DATA_PATH + "/impl/ShibMDScopeOptionalAttributes.xml";
-    }
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        expectedContent = "ThisIsSomeScopeValue";
-        expectedRegexp = Boolean.TRUE;
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementMarshall() {
-        ShibbolethMetadataScope scope = 
-            (ShibbolethMetadataScope) buildXMLObject(ShibbolethMetadataScope.DEFAULT_ELEMENT_NAME);
-        
-        scope.setValue(expectedContent);
-        
-        assertEquals(expectedDOM, scope);
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementOptionalAttributesMarshall() {
-        ShibbolethMetadataScope scope = 
-            (ShibbolethMetadataScope) buildXMLObject(ShibbolethMetadataScope.DEFAULT_ELEMENT_NAME);
-        
-        scope.setValue(expectedContent);
-        scope.setRegexp(expectedRegexp);
-        
-        assertEquals(expectedOptionalAttributesDOM, scope);
-    }
-    
-    /** {@inheritDoc} */
-    public void testSingleElementUnmarshall() {
-        ShibbolethMetadataScope scope = 
-            (ShibbolethMetadataScope) unmarshallElement(singleElementFile);
-        
-        assertNotNull("Unmarshalled object was null", scope);
-        assertEquals("Scope value", expectedContent, scope.getValue());
-        assertEquals("Regexp attribute value", Boolean.FALSE, scope.getRegexp());
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementOptionalAttributesUnmarshall() {
-        ShibbolethMetadataScope scope = 
-            (ShibbolethMetadataScope) unmarshallElement(singleElementOptionalAttributesFile);
-        
-        assertNotNull("Unmarshalled object was null", scope);
-        assertEquals("Scope value", expectedContent, scope.getValue());
-        assertEquals("Regexp attribute value", expectedRegexp, scope.getRegexp());
-    }
-    
-    /**
-     * Test the proper behavior of the XSBooleanValue attributes.
-     */
-    public void testXSBooleanAttributes() {
-        ShibbolethMetadataScope scope = 
-            (ShibbolethMetadataScope) buildXMLObject(ShibbolethMetadataScope.DEFAULT_ELEMENT_NAME);
-        
-        // regexp attribute
-        scope.setRegexp(Boolean.TRUE);
-        assertEquals("Unexpected value for boolean attribute found", Boolean.TRUE, scope.getRegexp());
-        assertNotNull("XSBooleanValue was null", scope.getRegexpXSBoolean());
-        assertEquals("XSBooleanValue was unexpected value", new XSBooleanValue(Boolean.TRUE, false),
-                scope.getRegexpXSBoolean());
-        assertEquals("XSBooleanValue string was unexpected value", "true", scope.getRegexpXSBoolean().toString());
-        
-        scope.setRegexp(Boolean.FALSE);
-        assertEquals("Unexpected value for boolean attribute found", Boolean.FALSE, scope.getRegexp());
-        assertNotNull("XSBooleanValue was null", scope.getRegexpXSBoolean());
-        assertEquals("XSBooleanValue was unexpected value", new XSBooleanValue(Boolean.FALSE, false),
-                scope.getRegexpXSBoolean());
-        assertEquals("XSBooleanValue string was unexpected value", "false", scope.getRegexpXSBoolean().toString());
-        
-        scope.setRegexp((Boolean) null);
-        assertEquals("Unexpected default value for boolean attribute found", Boolean.FALSE, scope.getRegexp());
-        assertNull("XSBooleanValue was not null", scope.getRegexpXSBoolean());
-    }
-
-}
diff --git a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValueTest.java.svn-base b/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValueTest.java.svn-base
deleted file mode 100644
index 1aa8c74..0000000
--- a/src/test/java/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValueTest.java.svn-base
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development, 
- * Inc. (UCAID) under one or more contributor license agreements.  See the 
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache 
- * License, Version 2.0 (the "License"); you may not use this file except in 
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package edu.internet2.middleware.shibboleth.common.xmlobject.impl;
-
-import edu.internet2.middleware.shibboleth.common.xmlobject.BaseShibObjectProviderTestCase;
-import edu.internet2.middleware.shibboleth.common.xmlobject.ShibbolethScopedValue;
-
-/**
- * Testing shib:ScopedValue encoder extension.
- */
-public class ShibScopedValueTest extends BaseShibObjectProviderTestCase {
-
-    /**
-     * Expected attribute value.
-     */
-    private String expectedValue;
-
-    /**
-     * Expected scope value.
-     */
-    private String expectedScope;
-
-    /**
-     * Name of the scope attribute.
-     */
-    private String scopeAttribute;
-
-    /**
-     * Scope delimiter.
-     */
-    private String scopeDelimiter;
-
-    /** Constructor. */
-    public ShibScopedValueTest() {
-        singleElementFile = DATA_PATH + "/impl/ShibScopedValue.xml";
-        singleElementOptionalAttributesFile = DATA_PATH + "/impl/ShibScopedValueOptionalAttributes.xml";
-    }
-
-    /** {@inheritDoc} */
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        expectedValue = "member";
-        expectedScope = "example.edu";
-        scopeAttribute = "scope";
-        scopeDelimiter = "@";
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementMarshall() {
-        ShibbolethScopedValue sv = (ShibbolethScopedValue) buildXMLObject(ShibbolethScopedValue.TYPE_NAME);
-
-        sv.setValue(expectedValue + scopeDelimiter + expectedScope);
-
-        assertEquals(expectedDOM, sv);
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementOptionalAttributesMarshall() {
-        ShibbolethScopedValue sv = (ShibbolethScopedValue) buildXMLObject(ShibbolethScopedValue.TYPE_NAME);
-
-        sv.setValue(expectedValue);
-        sv.setScopeAttributeName(scopeAttribute);
-        sv.setScope(expectedScope);
-
-        assertEquals(expectedOptionalAttributesDOM, sv);
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementUnmarshall() {
-        ShibbolethScopedValue sv = (ShibbolethScopedValue) unmarshallElement(singleElementFile);
-
-        assertNotNull("Unmarshalled object was null", sv);
-        assertEquals("Scoped value", expectedValue + scopeDelimiter + expectedScope, sv.getValue());
-    }
-
-    /** {@inheritDoc} */
-    public void testSingleElementOptionalAttributesUnmarshall() {
-        ShibbolethScopedValue sv = (ShibbolethScopedValue) unmarshallElement(singleElementOptionalAttributesFile);
-        sv.setScopeAttributeName(scopeAttribute);
-        assertNotNull("Unmarshalled object was null", sv);
-        assertEquals("Scoped value", expectedValue, sv.getValue());
-        assertEquals("Scope value", expectedScope, sv.getScope());
-        assertEquals("Scope attribute name", scopeAttribute, sv.getScopeAttributeName());
-    }
-
-}
\ No newline at end of file
diff --git a/src/test/resources/.svn/all-wcprops b/src/test/resources/.svn/all-wcprops
deleted file mode 100644
index 77b3f09..0000000
--- a/src/test/resources/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources
-END
-logback-test.xml
-K 25
-svn:wc:ra_dav:version-url
-V 81
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/logback-test.xml
-END
diff --git a/src/test/resources/.svn/entries b/src/test/resources/.svn/entries
deleted file mode 100644
index a338c7f..0000000
--- a/src/test/resources/.svn/entries
+++ /dev/null
@@ -1,65 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-data
-dir
-

-logback-test.xml
-file
-
-
-
-
-2014-02-19T17:27:40.882741Z
-2a1d8829b1591f8a5ef574af5894447d
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-583
-

diff --git a/src/test/resources/.svn/prop-base/logback-test.xml.svn-base b/src/test/resources/.svn/prop-base/logback-test.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/.svn/prop-base/logback-test.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/.svn/text-base/logback-test.xml.svn-base b/src/test/resources/.svn/text-base/logback-test.xml.svn-base
deleted file mode 100644
index 6a80715..0000000
--- a/src/test/resources/.svn/text-base/logback-test.xml.svn-base
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <logger name="edu.internet2.middleware.shibboleth.common">
-        <level value="TRACE"/>
-    </logger>
-    
-    <logger name="org.opensaml.util.resource">
-        <level value="DEBUG"/>
-    </logger>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level [%logger{36}:%line] - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root>
-        <level value="WARN"/>
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>
diff --git a/src/test/resources/data/.svn/all-wcprops b/src/test/resources/data/.svn/all-wcprops
deleted file mode 100644
index 03939c9..0000000
--- a/src/test/resources/data/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data
-END
diff --git a/src/test/resources/data/.svn/entries b/src/test/resources/data/.svn/entries
deleted file mode 100644
index d9c73fc..0000000
--- a/src/test/resources/data/.svn/entries
+++ /dev/null
@@ -1,34 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-database
-dir
-

-edu
-dir
-

diff --git a/src/test/resources/data/database/.svn/all-wcprops b/src/test/resources/data/database/.svn/all-wcprops
deleted file mode 100644
index 641a48b..0000000
--- a/src/test/resources/data/database/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 78
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/database
-END
-shibdb.script
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/java-shib-common/!svn/ver/740/branches/REL_1/src/test/resources/data/database/shibdb.script
-END
-shibdb.properties
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/database/shibdb.properties
-END
diff --git a/src/test/resources/data/database/.svn/entries b/src/test/resources/data/database/.svn/entries
deleted file mode 100644
index e0ede23..0000000
--- a/src/test/resources/data/database/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/database
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-shibdb.script
-file
-
-
-
-
-2014-02-19T17:27:39.870721Z
-2b8f4c1ce1b06665080e9f05431152c2
-2008-04-12T16:02:14.997005Z
-733
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2843
-

-shibdb.properties
-file
-
-
-
-
-2014-02-19T17:27:39.870721Z
-e8bed95a0569f5cf9edebfd272b4fb7c
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-415
-

diff --git a/src/test/resources/data/database/.svn/prop-base/shibdb.properties.svn-base b/src/test/resources/data/database/.svn/prop-base/shibdb.properties.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/resources/data/database/.svn/prop-base/shibdb.properties.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/resources/data/database/.svn/text-base/shibdb.properties.svn-base b/src/test/resources/data/database/.svn/text-base/shibdb.properties.svn-base
deleted file mode 100644
index 799a3f5..0000000
--- a/src/test/resources/data/database/.svn/text-base/shibdb.properties.svn-base
+++ /dev/null
@@ -1,17 +0,0 @@
-#HSQL Database Engine 1.8.0.7
-#Sun Mar 25 21:29:09 EDT 2007
-hsqldb.script_format=0
-runtime.gc_interval=0
-sql.enforce_strict_size=false
-hsqldb.cache_size_scale=8
-readonly=true
-hsqldb.nio_data_file=true
-hsqldb.cache_scale=14
-version=1.8.0
-hsqldb.default_table_type=memory
-hsqldb.cache_file_scale=1
-hsqldb.log_size=1
-modified=no
-hsqldb.cache_version=1.7.0
-hsqldb.original_version=1.8.0
-hsqldb.compatible_version=1.8.0
diff --git a/src/test/resources/data/database/.svn/text-base/shibdb.script.svn-base b/src/test/resources/data/database/.svn/text-base/shibdb.script.svn-base
deleted file mode 100644
index ebaffd1..0000000
--- a/src/test/resources/data/database/.svn/text-base/shibdb.script.svn-base
+++ /dev/null
@@ -1,53 +0,0 @@
-CREATE SCHEMA PUBLIC AUTHORIZATION DBA
-CREATE MEMORY TABLE PEOPLE(PERSONID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,NETID VARCHAR,FIRSTNAME VARCHAR,LASTNAME VARCHAR,EMAIL VARCHAR)
-CREATE MEMORY TABLE GROUPS(GROUPID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,GROUPNAME VARCHAR)
-CREATE MEMORY TABLE AFFILIATIONS(AFFILATIONID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,AFFILIATION VARCHAR)
-CREATE MEMORY TABLE PEOPLE_TO_GROUPS(PERSONID INTEGER,GROUPID INTEGER)
-CREATE MEMORY TABLE PEOPLE_TO_AFFILIATIONS(PERSONID INTEGER,AFFILIATIONID INTEGER)
-ALTER TABLE PEOPLE ALTER COLUMN PERSONID RESTART WITH 6
-ALTER TABLE GROUPS ALTER COLUMN GROUPID RESTART WITH 12
-ALTER TABLE AFFILIATIONS ALTER COLUMN AFFILATIONID RESTART WITH 7
-CREATE USER SA PASSWORD ""
-GRANT DBA TO SA
-SET WRITE_DELAY 10
-SET SCHEMA PUBLIC
-INSERT INTO PEOPLE VALUES(0,'astone','Alexander','Stone','astone at example.edu')
-INSERT INTO PEOPLE VALUES(1,'ptracy','Pam','Tracy','ptracy at example.edu')
-INSERT INTO PEOPLE VALUES(2,'sharting','Sue','Harting','sharting at example.edu')
-INSERT INTO PEOPLE VALUES(3,'dbartlett','David','Bartlett','dbartlett at example.edu')
-INSERT INTO PEOPLE VALUES(4,'hsmith','Harris','Smith','hsmith at example.edu')
-INSERT INTO PEOPLE VALUES(5,'zhalo','Zac','Halo','zhalo at example.edu')
-INSERT INTO GROUPS VALUES(0,'Active Minds')
-INSERT INTO GROUPS VALUES(1,'Aikido')
-INSERT INTO GROUPS VALUES(2,'Astronomy')
-INSERT INTO GROUPS VALUES(3,'Eco-Action')
-INSERT INTO GROUPS VALUES(4,'Knitting Club')
-INSERT INTO GROUPS VALUES(5,'Poetry Club')
-INSERT INTO GROUPS VALUES(6,'Step Team')
-INSERT INTO GROUPS VALUES(7,'Surf Club')
-INSERT INTO GROUPS VALUES(8,'Yoga')
-INSERT INTO GROUPS VALUES(9,'Peace Action')
-INSERT INTO GROUPS VALUES(10,'German Club')
-INSERT INTO GROUPS VALUES(11,'Ballroom Dance Club')
-INSERT INTO AFFILIATIONS VALUES(0,'faculty')
-INSERT INTO AFFILIATIONS VALUES(1,'student')
-INSERT INTO AFFILIATIONS VALUES(2,'staff')
-INSERT INTO AFFILIATIONS VALUES(3,'alum')
-INSERT INTO AFFILIATIONS VALUES(4,'member')
-INSERT INTO AFFILIATIONS VALUES(5,'affiliate')
-INSERT INTO AFFILIATIONS VALUES(6,'employee')
-INSERT INTO PEOPLE_TO_GROUPS VALUES(0,4)
-INSERT INTO PEOPLE_TO_GROUPS VALUES(1,11)
-INSERT INTO PEOPLE_TO_GROUPS VALUES(2,2)
-INSERT INTO PEOPLE_TO_GROUPS VALUES(3,6)
-INSERT INTO PEOPLE_TO_GROUPS VALUES(4,9)
-INSERT INTO PEOPLE_TO_GROUPS VALUES(3,7)
-INSERT INTO PEOPLE_TO_GROUPS VALUES(1,10)
-INSERT INTO PEOPLE_TO_GROUPS VALUES(5,2)
-INSERT INTO PEOPLE_TO_AFFILIATIONS VALUES(2,4)
-INSERT INTO PEOPLE_TO_AFFILIATIONS VALUES(1,1)
-INSERT INTO PEOPLE_TO_AFFILIATIONS VALUES(2,3)
-INSERT INTO PEOPLE_TO_AFFILIATIONS VALUES(5,2)
-INSERT INTO PEOPLE_TO_AFFILIATIONS VALUES(3,6)
-INSERT INTO PEOPLE_TO_AFFILIATIONS VALUES(4,4)
-INSERT INTO PEOPLE_TO_AFFILIATIONS VALUES(0,0)
diff --git a/src/test/resources/data/edu/.svn/all-wcprops b/src/test/resources/data/edu/.svn/all-wcprops
deleted file mode 100644
index 0f04ffc..0000000
--- a/src/test/resources/data/edu/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data/edu
-END
diff --git a/src/test/resources/data/edu/.svn/entries b/src/test/resources/data/edu/.svn/entries
deleted file mode 100644
index d579a19..0000000
--- a/src/test/resources/data/edu/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-internet2
-dir
-

diff --git a/src/test/resources/data/edu/internet2/.svn/all-wcprops b/src/test/resources/data/edu/internet2/.svn/all-wcprops
deleted file mode 100644
index 6a163e9..0000000
--- a/src/test/resources/data/edu/internet2/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 84
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data/edu/internet2
-END
diff --git a/src/test/resources/data/edu/internet2/.svn/entries b/src/test/resources/data/edu/internet2/.svn/entries
deleted file mode 100644
index 8a1ef85..0000000
--- a/src/test/resources/data/edu/internet2/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-middleware
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/.svn/all-wcprops
deleted file mode 100644
index 694e34c..0000000
--- a/src/test/resources/data/edu/internet2/middleware/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 95
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data/edu/internet2/middleware
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/.svn/entries b/src/test/resources/data/edu/internet2/middleware/.svn/entries
deleted file mode 100644
index fb503d8..0000000
--- a/src/test/resources/data/edu/internet2/middleware/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-shibboleth
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/.svn/all-wcprops
deleted file mode 100644
index 77468ed..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 106
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/.svn/entries
deleted file mode 100644
index e24d734..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-common
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops
deleted file mode 100644
index ec30eca..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 113
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/.svn/entries
deleted file mode 100644
index 234d2d8..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/.svn/entries
+++ /dev/null
@@ -1,40 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-attribute
-dir
-

-config
-dir
-

-security
-dir
-

-xmlobject
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops
deleted file mode 100644
index d41310f..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 122
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries
deleted file mode 100644
index 75f987c..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-filtering
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops
deleted file mode 100644
index 03656e4..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/all-wcprops
+++ /dev/null
@@ -1,23 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 132
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering
-END
-policy1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 144
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/policy1.xml
-END
-policy2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 144
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/policy2.xml
-END
-policy3.xml
-K 25
-svn:wc:ra_dav:version-url
-V 144
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/policy3.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries
deleted file mode 100644
index 3a34f66..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/entries
+++ /dev/null
@@ -1,133 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-policy1.xml
-file
-
-
-
-
-2014-02-19T17:27:39.966723Z
-53a89293fe5580f2a1e18de2f29aa979
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5159
-

-policy2.xml
-file
-
-
-
-
-2014-02-19T17:27:39.966723Z
-cfca4088e7da8f3be9a71cec1a347bb0
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1444
-

-policy3.xml
-file
-
-
-
-
-2014-02-19T17:27:39.966723Z
-b7eb54c5848df7dcd02e1b8ffeaf9ba9
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-794
-

-provider
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy3.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/prop-base/policy3.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy1.xml.svn-base
deleted file mode 100644
index 8d814e9..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy1.xml.svn-base
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="PolicyExample1" xsi:schemaLocation="urn:mace:shibboleth:2.0:afp ../../../../../../../../../resources/classpath/schema/shibboleth-2.0-afp.xsd                                                     urn:mace:shibboleth:2.0:afp:mf:basic ../../../../../../../../../resources/classpath/schema/shibboleth-2.0-afp-mf-basic.xsd ">
-
-    <!--
-        Release attributes if the person is not an alumni or a student with FERPA suppression.
-    -->
-    <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" id="studentWithSuppression" xsi:type="OR">
-        <Rule xsi:type="NOT">
-            <Rule xsi:type="AttributeValueString" attributeID="affilition" value="student"/>
-        </Rule>
-        <Rule xsi:type="NOT">
-            <Rule xsi:type="AttributeValueString" attributeID="affilition" value="alum"/>
-        </Rule>
-        <Rule xsi:type="AND">
-            <Rule xsi:type="AttributeValueString" attributeID="affilition" value="student"/>
-            <Rule xsi:type="AttributeValueString" attributeID="ferpa" value="false"/>
-        </Rule>
-    </afp:PermitValueRule>
-    
-    <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" id="eduPersonAffiliationValues" xsi:type="OR">
-                    <Rule xsi:type="AttributeValueString" value="faculty"/>
-                    <Rule xsi:type="AttributeValueString" value="student"/>
-                    <Rule xsi:type="AttributeValueString" value="staff"/>
-                    <Rule xsi:type="AttributeValueString" value="alum"/>
-                    <Rule xsi:type="AttributeValueString" value="member"/>
-                    <Rule xsi:type="AttributeValueString" value="affiliate"/>
-                    <Rule xsi:type="AttributeValueString" value="employee"/>
-                </afp:PermitValueRule>
-
-    <!-- Release some attributes to JSTOR -->
-    <afp:AttributeFilterPolicy id="JSTORRelease">
-        <!-- This policy is in effect if the requester entity ID is JSTORs -->
-        <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://www.jstor.org/shibboleth"/>
-
-        <!-- Release a transient ID -->
-        <afp:AttributeRule attributeID="transientID">
-            <afp:PermitValueRule xsi:type="basic:ANY"/>
-        </afp:AttributeRule>
-
-        <!-- Release user's first name if not an alum or a student with FERPA suppresion  -->
-        <afp:AttributeRule attributeID="firstName">
-            <afp:PermitValueRuleReference ref="studentWithSuppression"/>
-        </afp:AttributeRule>
-
-        <!-- Release email address if not an alum or a student with FERPA suppresion  -->
-        <afp:AttributeRule attributeID="email">
-            <afp:PermitValueRuleReference ref="studentWithSuppression"/>
-        </afp:AttributeRule>
-
-        <!-- Release primary affiliation and verify that there is only one value -->
-        <afp:AttributeRule attributeID="eduPersonPrimaryAffiliation">
-            <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" xsi:type="AND"> 
-                <RuleReference ref="eduPersonAffiliationValues"/>
-                <Rule xsi:type="basic:NumberOfAttributeValues" maximum="1"/>
-            </afp:PermitValueRule>
-        </afp:AttributeRule>
-
-    </afp:AttributeFilterPolicy>
-
-    <!-- Release some attributes to ScienceDirect -->
-    <afp:AttributeFilterPolicy id="ScienceDirect">
-        <!-- This policy is in effect if the requester entity ID is ScienceDirect -->
-        <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://sdauth.sciencedirect.com/"/>
-
-        <!-- Release a persistent ID -->
-        <afp:AttributeRule attributeID="persistentID">
-            <afp:PermitValueRule xsi:type="basic:ANY"/>
-        </afp:AttributeRule>
-
-        <!-- Release user's first name if not an alum or a student with FERPA suppresion  -->
-        <afp:AttributeRule attributeID="firstName">
-            <afp:PermitValueRuleReference ref="studentWithSuppression"/>
-        </afp:AttributeRule>
-
-        <!-- Release email address if not an alum or a student with FERPA suppresion  -->
-        <afp:AttributeRule attributeID="email">
-            <afp:PermitValueRuleReference ref="studentWithSuppression"/>
-        </afp:AttributeRule>
-
-        <!-- Release primary affiliation and verify that there is only one value -->
-        <afp:AttributeRule attributeID="eduPersonPrimaryAffiliation">
-            <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" xsi:type="AND">
-                <RuleReference ref="eduPersonAffiliationValues"/>
-                <Rule xsi:type="NumberOfAttributeValues" maximum="1"/>
-            </afp:PermitValueRule>
-        </afp:AttributeRule>
-
-        <!-- Release affiliation -->
-        <afp:AttributeRule attributeID="eduPersonPrimaryAffiliation">
-            <afp:PermitValueRuleReference ref="eduPersonAffiliationValues"/>
-        </afp:AttributeRule>
-
-    </afp:AttributeFilterPolicy>
-
-</afp:AttributeFilterPolicyGroup>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy2.xml.svn-base
deleted file mode 100644
index 6dbcbb5..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy2.xml.svn-base
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="PolicyExample2" xsi:schemaLocation="urn:mace:shibboleth:2.0:afp classpath:/schema/shibboleth-2.0-afp.xsd                                                     urn:mace:shibboleth:2.0:afp:mf:basic classpath:/schema/shibboleth-2.0-afp-mf-basic.xsd ">
-
-    <!-- Release affiliation to anyone in the InCommon group -->
-    <afp:AttributeFilterPolicy id="InCommonRelease">
-        <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
-        
-        <afp:AttributeRule attributeID="affiliation">
-            <afp:PermitValueRule xmlns="urn:mace:shibboleth:2.0:afp:mf:basic" xsi:type="OR">
-                <Rule xsi:type="AttributeValueString" value="faculty"/>
-                <Rule xsi:type="AttributeValueString" value="student"/>
-                <Rule xsi:type="AttributeValueString" value="staff"/>
-                <Rule xsi:type="AttributeValueString" value="alum"/>
-                <Rule xsi:type="AttributeValueString" value="member"/>
-                <Rule xsi:type="AttributeValueString" value="affiliate"/>
-                <Rule xsi:type="AttributeValueString" value="employee"/>
-            </afp:PermitValueRule>
-        </afp:AttributeRule>
-        
-    </afp:AttributeFilterPolicy>
-  
-</afp:AttributeFilterPolicyGroup>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy3.xml.svn-base
deleted file mode 100644
index a0ee56e..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/.svn/text-base/policy3.xml.svn-base
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<afp:AttributeFilterPolicyGroup xmlns:afp="urn:mace:shibboleth:2.0:afp" xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="PolicyExample3" xsi:schemaLocation="urn:mace:shibboleth:2.0:afp classpath:/schema/shibboleth-2.0-afp.xsd                                                     urn:mace:shibboleth:2.0:afp:mf:basic classpath:/schema/shibboleth-2.0-afp-mf-basic.xsd ">
-
-    <afp:AttributeFilterPolicy id="MostBasicExample">
-        <afp:PolicyRequirementRule xsi:type="basic:ANY"/>
-        
-        <afp:AttributeRule attributeID="email">
-            <afp:PermitValueRule xsi:type="basic:ANY"/>
-        </afp:AttributeRule>
-    </afp:AttributeFilterPolicy>
-    
-</afp:AttributeFilterPolicyGroup>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops
deleted file mode 100644
index 35fff7d..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 141
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries
deleted file mode 100644
index 4084d10..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-match
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops
deleted file mode 100644
index e16aa47..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 147
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries
deleted file mode 100644
index 01250e7..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-basic
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops
deleted file mode 100644
index 0fa9df2..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic
-END
-metadata.xml
-K 25
-svn:wc:ra_dav:version-url
-V 166
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/metadata.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries
deleted file mode 100644
index b852023..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-metadata.xml
-file
-
-
-
-
-2014-02-19T17:27:39.962723Z
-812163b7017f2d8ec4208d4b999b725d
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-61801
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/metadata.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/prop-base/metadata.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/metadata.xml.svn-base
deleted file mode 100644
index 09c7325..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/provider/match/basic/.svn/text-base/metadata.xml.svn-base
+++ /dev/null
@@ -1,1113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:incommon" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:SignedInfo>
-<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-<ds:Reference URI="">
-<ds:Transforms>
-<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-</ds:Transforms>
-<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-<ds:DigestValue>91oiRc8Bwf+DJq/kO/4vQh723F8=</ds:DigestValue>
-</ds:Reference>
-</ds:SignedInfo>
-<ds:SignatureValue>
-txodSjGrZlegJY9lHLlxfhOpK0v8SGNmFFHPXM9j54gZdbK+N8+4rPEjVCOg33Bk8RZ+OcBQNQQH
-otCvlXEpput84qTDVbe8xIGXzTbRH+45oLV6PQCEvZ4Pd3W/D2BZmI77DLHOlsQFJW2B6Ct98sO6
-qvWi7hStX8qaPnZe3hpDOgdhNpfZh/WiY5VTPsYT/+KHFv1wM3AqIPUKJ/9q6ahD80NlpJzpliE9
-PbEnEiuUKWq255jNBnbl/xR4jN+MhX1pOzxD1x+tDqJLVL+rgoHQZJHoxHzYykRKW4FITRL0ASXZ
-lgKxBy5k/W0hPzm4ntrX3OvpW49S0ys3BlAEWQ==
-</ds:SignatureValue>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIF2zCCBMOgAwIBAgIBQjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-SW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwHhcNMDYwNDEwMTY1NjM3WhcNMDcwNDEwMTY1NjM3WjBSMQswCQYDVQQGEwJVUzEcMBoG
-A1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjElMCMGA1UEAxMcZmVkb3AuaW5jb21tb25mZWRlcmF0
-aW9uLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAoXZK5/nRuWY+S91CMPsXl
-oDc5vGo8O/xcqkUNUow+C34NlgnZX4zq2BjZ1WTAk3yLaF00qYOK18R0LMpHjYmEbtvtNrjEvtaZ
-walo83TyRNKHfqvBG3bxOkoYpo8jZ9MkHxskCgjXWLnPu+TCB7GiDgBLQ2VEk/UneKHlNc0Y1drB
-r1HfiRR73lAIUXNG/iRGXyBLqvyyFPasZv/oBWmsJZqI2T8jlmdSZbMG66yWGMp9dKoJyb44fYGV
-lyo5j8arxyiXAEz4QIdoFhmm1k1wSQnJDHtYaxwpf72wywps9P6GLqGkg8z+sxPWEgP8QqZWhwNJ
-qAtVbNh+TDkBpXsCAwEAAaOCArYwggKyMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQU5ij9YLU5zQ6K75kPgVpyQ2N/
-lPswfgYDVR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRww
-GgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGaaHR0cDov
-L2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRz
-LnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlo
-dHRwOi8vaW5jb21tb25jcmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmww
-P6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVj
-cmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9p
-bmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJhY3RpY2VzLnBkZjAnBgNVHREEIDAe
-ghxmZWRvcC5pbmNvbW1vbmZlZGVyYXRpb24ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQDNwpH5FdVi
-qXKwN51xRQhSabH04DIFo9tnGWA/U2MOH1Gwh2Vt0JzlxZ5gZrsUM9gQBMLmifjxB29rY2xnhhjW
-FJhoTsI2F2KPav6W5Eqykq3yDV06oqNq0N0yMtB+og2yCIIZFvEG0wTKyv2n3bZqNaXz9r808b7p
-v/OVPW4HnmUtfFDg8q7C4Y2wbWqBYINkOi4lVbKzi2Sk5nVohuRGBja7eTYlpBP3nF+E/xb49JxQ
-AErc8wFZhJJdKNBnGWKOxelxC4nwda+g3mcc2T6REM0OUU7ArAlOdXW1eYNtflZe1G4qJ+6lTbpx
-8unyNnbIxDshbno8FbG0gIXOQ/4s
-</ds:X509Certificate>
-<ds:X509Certificate>
-MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-SW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoG
-A1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx
-82/CWPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yuoUDA754I
-f0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhPtzcDR33gtaAb3oilZ+ZT
-pnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOzD1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+
-zbkCge6wgipZyXxaOAam6ncqmkxy+hy/OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJIS
-XhC4RAReA0HyBp/wd0iDAgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRitY+Ob
-ZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0
-aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBugYIKwYB
-BQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGaaHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVk
-ZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6
-aHR0cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
-LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwxLmluY29t
-bW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNy
-bDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysG
-AQQBriMBBAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvcHJhY3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlF
-TMlUGspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxkpwn410si
-umxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyjuJg/JQz1LnHMocIW/Jli
-gloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGEZqrCXL0FMZLSr+Vady/tFbVojqI8pSub
-SMxNkZectePTBjVj1Qeb4hmG8jRv/fwy1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTw
-nP7Nhfotgaxf5wG8WA==
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo></ds:Signature>
-  <Extensions>
-    <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-      <!-- InCommon CA -->
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
-MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
-dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
-WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
-oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
-tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
-D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
-OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
-AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
-Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
-bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
-aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
-L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
-Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
-LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
-cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
-OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
-ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
-AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
-Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
-GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
-pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
-uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
-ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
-1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </shibmd:KeyAuthority>
-  </Extensions>
-
-<EntityDescriptor entityID="urn:mace:incommon:internet2.edu">
-   <IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>origin.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.internet2.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>origin.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://origin.internet2.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Internet2</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en"/>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="urn:mace:incommon:dartmouth.edu">
-    <IDPSSODescriptor errorURL="http://giza.dartmouth.edu/shibboleth/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>giza.dartmouth.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://giza.dartmouth.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor errorURL="http://giza.dartmouth.edu/shibboleth/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>giza.dartmouth.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://giza.dartmouth.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Dartmouth College</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Dartmouth College</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.dartmouth.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Robert Brentrup</GivenName>
-      <EmailAddress>Robert.J.Brentrup at dartmouth.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Robert Brentrup</GivenName>
-      <EmailAddress>Robert.J.Brentrup at dartmouth.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:rochester.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.its.rochester.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.its.rochester.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.its.rochester.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.its.rochester.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Rochester</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Rochester</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.rochester.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Sean Singh</GivenName>
-      <EmailAddress>sean.singh at rochester.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Sean Singh</GivenName>
-      <EmailAddress>sean.singh at rochester.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Charles Yanaitis</GivenName>
-      <EmailAddress>charles.yanaitis at rochester.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:osu.edu">
-   <IDPSSODescriptor errorURL="https://webauth.service.ohio-state.edu/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>webauth.service.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/shibboleth/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.service.ohio-state.edu/shibboleth/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>webauth.service.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Ohio State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Ohio State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.osu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Scott Cantor</GivenName>
-      <EmailAddress>cantor.2 at osu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Scott Cantor</GivenName>
-      <EmailAddress>cantor.2 at osu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:uci.edu">
-   <IDPSSODescriptor errorURL="http://shib.nacs.uci.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu/shibboleth-idp/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nacs.uci.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Irvine</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Irvine</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="urn:mace:incommon:buffalo.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">buffalo.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.buffalo.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.buffalo.edu/shibboleth-ext/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">buffalo.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.buffalo.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.buffalo.edu:7443/shibboleth-ext/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">The State University of New York at Buffalo</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The State University of New York at Buffalo</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.buffalo.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Charles Dunn</GivenName>
-      <EmailAddress>chuck at buffalo.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>John A Ball</GivenName>
-      <EmailAddress>auth-support at gory.acsu.buffalo.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Joel W. Murphy</GivenName>
-      <EmailAddress>jmurphy at buffalo.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:washington.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>hs.so.cac.washington.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hs.so.cac.washington.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>hs.so.cac.washington.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.so.cac.washington.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Washington</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Washington</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.washington.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Nathan Dors</GivenName>
-      <EmailAddress>dors at cac.washington.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Nathan Dors</GivenName>
-      <EmailAddress>pubcookie at cac.washington.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:cornell.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiborigin.cit.cornell.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiborigin.cit.cornell.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Cornell University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cornell.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Andrea Beesing</GivenName>
-      <EmailAddress>amb3 at cornell.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Steve Edgar</GivenName>
-      <EmailAddress>se10 at cornell.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Ron DiNapoli</GivenName>
-      <EmailAddress>rd29 at cornell.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:psu.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>as1.fim.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://as1.fim.psu.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>as1.fim.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Technical Staff</GivenName>
-      <EmailAddress>root at aset.psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Kevin Morooney</GivenName>
-      <EmailAddress>kxm at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Mark Miller</GivenName>
-      <EmailAddress>max at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:usc.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib1.usc.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.usc.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib1.usc.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.usc.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Southern California</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Southern California</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.usc.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Cecelia E. Henderson</GivenName>
-      <EmailAddress>shelley at usc.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Phil Dibowitz</GivenName>
-      <EmailAddress>phil at usc.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:ucsd.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>a4.ucsd.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://a4.ucsd.edu/tritON/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>a4.ucsd.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://a4.ucsd.edu:8443/tritON/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of California-San Diego</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-San Diego</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ucsd.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Crystal Harris</GivenName>
-      <EmailAddress>crys at ucsd.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Anthony R. Wood</GivenName>
-      <EmailAddress>twood at ucsd.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Anthony R. Wood</GivenName>
-      <EmailAddress>twood at ucsd.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:ohio.edu">
-    <IDPSSODescriptor errorURL="https://shibboleth.ohio.edu" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.ohio.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ohio.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor errorURL="https://shibboleth.ohio.edu" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.ohio.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ohio.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Ohio University Main Campus</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Ohio University Main Campus</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ohiou.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Todd Acheson</GivenName>
-      <EmailAddress>acheson at ohio.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Vitaliy Shipitsyn</GivenName>
-      <EmailAddress>vshipits at ohio.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>David Alexander</GivenName>
-      <EmailAddress>alexandd at ohio.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-<EntityDescriptor entityID="https://getz.internet2.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>getz.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://getz.internet2.edu/Shibboleth.sso/SAML/POST" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://getz.internet2.edu/Shibboleth.shire" index="0"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Internet2</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en"/>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-  <EntityDescriptor entityID="https://www.internet2.edu/shibboleth">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.internet2.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www.internet2.edu/Shibboleth.shire" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.internet2.edu/Shibboleth.shire" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Internet2 Web Site</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2 Web Site</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="https://sdauth.sciencedirect.com/">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth-cert3.sciencedirect.com/SHIRE" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">ScienceDirect</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">ScienceDirect</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.sciencedirect.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-
-<EntityDescriptor entityID="https://wiki.it.ohio-state.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>wiki.it.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="1" isDefault="true"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="2"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="3"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="4"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Ohio State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Ohio State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.osu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Webauth Technical Support Staff</GivenName>
-      <EmailAddress>webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Webauth Technical Support Staff</GivenName>
-      <EmailAddress>webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="http://www.sciencedirect.com/">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">ScienceDirect</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">ScienceDirect</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.sciencedirect.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="https://shib.dev.oclc.org/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.dev.oclc.org</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://shib.dev.oclc.org:2080/Shibboleth.shire" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.dev.oclc.org:2443/Shibboleth.shire" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Online Computer Library Center Inc.</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Online Computer Library Center Inc.</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.oclc.org</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>allene at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>allene at oclc.org</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-<EntityDescriptor entityID="https://shib.oclc.org/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.oclc.org</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.shire" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://shib.oclc.org:2080/Shibboleth.shire" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Online Computer Library Center Inc.</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Online Computer Library Center Inc.</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.oclc.org</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Sharon Ramsay</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Richard Scranton</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="https://shibtest.nac.uci.edu/cgi-bin/printenv">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibtest.nac.uci.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.nac.uci.edu/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">UCIs InCommon Demo Resource</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">UCIs InCommon Demo Resource</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-  <EntityDescriptor entityID="https://share.internet2.edu/shibboleth">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>share.internet2.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://share.internet2.edu/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Internet2 Wiki</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2 Wiki</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="https://www.webassign.net/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>www.webassign.net</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webassign.net/Shibboleth.sso" index="0"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">WebAssign</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">WebAssign</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.webassign.net/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Brian Marks</GivenName>
-      <EmailAddress>brian at webassign.net</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:cornell.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiborigin.cit.cornell.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiborigin.cit.cornell.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Cornell University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cornell.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Todd Zino</GivenName>
-      <EmailAddress>tcz3 at cornell.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Pete Bosanko</GivenName>
-      <EmailAddress>pb10 at cornell.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Andrea Beesing</GivenName>
-      <EmailAddress>amb3 at cornell.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:case.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shibb.case.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.case.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shibb.case.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Case Western Reserve University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Case Western Reserve University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cwru.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Jeremy Smith</GivenName>
-      <EmailAddress>jeremy.smith at case.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>David Kovacic</GivenName>
-      <EmailAddress>david.kovacic at case.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://www.e-education.psu.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>www.e-education.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.e-education.psu.edu/Shibboleth.sso/SAML/POST" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.e-education.psu.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Jeff Buechler</GivenName>
-      <EmailAddress>jdb11 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Jeff Wolfe</GivenName>
-      <EmailAddress>wolfe at ems.psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://angelshibaccept.ais.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>angelshibaccept.ais.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://angelshibaccept.ais.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://shib.cms.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.cms.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.cms.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://shib.nacs.uci.edu/cgi-bin/printenv">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.nacs.uci.edu/Shibboleth.sso/SAML/POST" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.nacs.uci.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Irvine</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Irvine</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://cms.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>cms.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cms.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:ucla.edu">
-   <IDPSSODescriptor errorURL="https://shb.ais.ucla.edu/shibboleth-idp/WAYFerror" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shb.ais.ucla.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu/shibboleth-idp/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shb.ais.ucla.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shb.ais.ucla.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Los Angeles</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Los Angeles</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ucla.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Datta Mahabalagiri</GivenName>
-      <EmailAddress>datta at ais.ucla.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Albert Wu</GivenName>
-      <EmailAddress>albertwu at ucla.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops
deleted file mode 100644
index 831420a..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 120
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config
-END
-base-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 136
-/java-shib-common/!svn/ver/1061/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/base-config.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/entries
deleted file mode 100644
index e38c361..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/entries
+++ /dev/null
@@ -1,74 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-metadata
-dir
-

-attribute
-dir
-

-security
-dir
-

-relyingparty
-dir
-

-base-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.522734Z
-a7f44af2de434c7dee505aa88e7138f8
-2013-03-13T15:36:41.687656Z
-1061
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3679
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/base-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/base-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/prop-base/base-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/base-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/base-config.xml.svn-base
deleted file mode 100644
index 135bcd2..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/.svn/text-base/base-config.xml.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
-    <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel">
-        <constructor-arg value="true" type="boolean"/>
-    </bean>
-
-    <!--
-        <bean id="shibboleth.LogbackLogging"
-        class="edu.internet2.middleware.shibboleth.common.log.LogbackLoggingService" depends-on="shibboleth.TaskTimer">
-        <constructor-arg ref="shibboleth.TaskTimer" /> <constructor-arg value="$IDP_HOME$/conf/logging.xml" />
-        <constructor-arg value="600000" /> </bean>
-    -->
-
-    <!-- Spring configuration file that bootstraps OpenSAML -->
-    <bean id="shibboleth.OpensamlConfig" class="edu.internet2.middleware.shibboleth.common.config.OpensamlConfigBean">
-        <constructor-arg>
-            <list>
-                <bean id="shibMetadataExtensions" class="org.opensaml.util.resource.ClasspathResource">
-                    <constructor-arg value="/shibboleth-saml-ext-config.xml"/>
-                </bean>
-            </list>
-        </constructor-arg>
-    </bean>
-
-    <bean id="shibboleth.IdGenerator" class="org.opensaml.common.impl.SecureRandomIdentifierGenerator">
-        <constructor-arg value="SHA1PRNG"/>
-    </bean>
-
-    <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
-        <property name="velocityProperties">
-            <props>
-                <prop key="resource.loader">classpath, string</prop>
-                <prop key="classpath.resource.loader.class">
-                    org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-                </prop>
-                <prop key="string.resource.loader.class">
-                    org.apache.velocity.runtime.resource.loader.StringResourceLoader
-                </prop>
-            </props>
-        </property>
-    </bean>
-
-    <bean id="shibboleth.TemplateEngine" class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.TemplateEngine">
-        <constructor-arg ref="shibboleth.VelocityEngine"/>
-    </bean>
-
-    <bean id="shibboleth.ParserPool" class="org.opensaml.xml.parse.StaticBasicParserPool" init-method="initialize">
-        <property name="maxPoolSize" value="100"/>
-        <property name="coalescing" value="true"/>
-        <property name="ignoreComments" value="true"/>
-        <property name="ignoreElementContentWhitespace" value="true"/>
-        <property name="namespaceAware" value="true"/>
-        <property name="builderAttributes">
-            <map>
-                <entry>
-                    <key>
-                        <value>http://apache.org/xml/properties/security-manager</value>
-                    </key>
-                    <bean id="shibboleth.XercesSecurityManager" class="org.apache.xerces.util.SecurityManager"/>
-                </entry>
-            </map>
-        </property>
-        <property name="builderFeatures">
-            <map>
-                <entry>
-                    <key>
-                        <value>http://apache.org/xml/features/disallow-doctype-decl</value>
-                    </key>
-                    <util:constant static-field="java.lang.Boolean.TRUE"/>
-                </entry>
-            </map>
-        </property>
-    </bean>
-
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops
deleted file mode 100644
index 1bc3823..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 129
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute
-END
-service-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 148
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/service-config.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries
deleted file mode 100644
index 2e2f824..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/entries
+++ /dev/null
@@ -1,68 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-resolver
-dir
-

-service-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.374731Z
-281b167cb850676150b845666cdbc4cc
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1276
-

-filter
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/service-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/service-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/prop-base/service-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/service-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/service-config.xml.svn-base
deleted file mode 100644
index dd8514d..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/.svn/text-base/service-config.xml.svn-base
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" default-autowire="byType">
-
-    <bean id="staticConfig" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver.xml"/>
-    </bean>
-
-    <bean id="resolver" class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="staticConfig"/>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="shibboleth.SAML2AttributeAuthority" class="edu.internet2.middleware.shibboleth.common.attribute.provider.ShibbolethSAML2AttributeAuthority">
-        <constructor-arg ref="resolver"/>
-    </bean>
-
-    <bean id="shibboleth.SAML1AttributeAuthority" class="edu.internet2.middleware.shibboleth.common.attribute.provider.ShibbolethSAML1AttributeAuthority">
-        <constructor-arg ref="resolver"/>
-    </bean>
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/all-wcprops
deleted file mode 100644
index c5fce80..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 136
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter
-END
-service-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/service-config.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/entries
deleted file mode 100644
index 29e09e4..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-service-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.374731Z
-55e2be3fdb9d5380d8dbf301dd5ef1cc
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1898
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/prop-base/service-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/prop-base/service-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/prop-base/service-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/text-base/service-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/text-base/service-config.xml.svn-base
deleted file mode 100644
index 0256e89..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/filter/.svn/text-base/service-config.xml.svn-base
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
-    <bean id="policy2" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/policy2.xml"/>
-    </bean>
-
-    <bean id="policy3" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/attribute/filtering/policy3.xml"/>
-    </bean>
-
-    <bean id="engineA" class="edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethAttributeFilteringEngine" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="policy3"/>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="engineB" class="edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethAttributeFilteringEngine" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="policy2"/>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="engineC" class="edu.internet2.middleware.shibboleth.common.attribute.filtering.provider.ShibbolethAttributeFilteringEngine" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="policy2"/>
-                <ref bean="policy3"/>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops
deleted file mode 100644
index 56c15e5..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/all-wcprops
+++ /dev/null
@@ -1,53 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 138
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver
-END
-resolver-mapped.xml
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-mapped.xml
-END
-resolver-db-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 161
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-db-config.xml
-END
-resolver-mapped-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-mapped-config.xml
-END
-resolver-template.xml
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-template.xml
-END
-resolver-template-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 167
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-template-config.xml
-END
-resolver.xml
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver.xml
-END
-resolver-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 158
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-config.xml
-END
-resolver-db.xml
-K 25
-svn:wc:ra_dav:version-url
-V 154
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-db.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries
deleted file mode 100644
index b89b9b1..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/entries
+++ /dev/null
@@ -1,300 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-resolver.xml
-file
-
-
-
-
-2014-02-19T17:27:40.334731Z
-9d1ce740df0763a67124addb210dfcfe
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3395
-

-resolver-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.334731Z
-38d5aaae8330bdaa7cc74ed95a02fdfb
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-949
-

-resolver-db.xml
-file
-
-
-
-
-2014-02-19T17:27:40.334731Z
-63a007c22080b60d443be950b84d434d
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2709
-

-resolver-mapped.xml
-file
-
-
-
-
-2014-02-19T17:27:40.334731Z
-2e98ae294bcf68bde1a93018d413a637
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2436
-

-resolver-db-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.338731Z
-1e26cc0cf1f9da78a32d0c31d880ed28
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-939
-

-resolver-mapped-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.338731Z
-d99a58ce24bab1c5cd8847b2f38b6934
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-958
-

-resolver-template.xml
-file
-
-
-
-
-2014-02-19T17:27:40.338731Z
-6e46c93c1b3f13387a393c30670d86de
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1766
-

-resolver-template-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.338731Z
-50d6a94873847b6dbe134f3aacefde75
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-962
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-db-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-db-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-db-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-db.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-db.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-db.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-mapped-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-mapped-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-mapped-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-mapped.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-mapped.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-mapped.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-template-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-template-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-template-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-template.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-template.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver-template.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/prop-base/resolver.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-config.xml.svn-base
deleted file mode 100644
index 3760435..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-config.xml.svn-base
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" default-autowire="byType">
-
-    <!-- Test Resolver Configurations -->
-    <bean id="staticConfig" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver.xml"/>
-    </bean>    
-    
-    
-    <!-- Test resolver instances -->
-    <bean id="resolver" class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="staticConfig"/>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-db-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-db-config.xml.svn-base
deleted file mode 100644
index c624692..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-db-config.xml.svn-base
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" default-autowire="byType">
-
-    <!-- Test Resolver Configurations -->
-    <bean id="dbConfig" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-db.xml"/>
-    </bean>
-
-    
-    <!-- Test resolver instances -->
-    <bean id="resolver-db" class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="dbConfig"/>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-db.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-db.xml.svn-base
deleted file mode 100644
index 2d4a827..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-db.xml.svn-base
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xsi:schemaLocation="         urn:mace:shibboleth:2.0:resolver classpath:/schema/shibboleth-2.0-attribute-resolver.xsd         urn:mace:shibboleth:2.0:attribute:encoder classpat [...]
-        
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="uid" sourceAttributeID="NETID">
-        <resolver:Dependency ref="LocalDatabase"/>
-    </resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="ad:Script" id="fullname">
-        <resolver:Dependency ref="FIRSTNAME"/>
-        <resolver:Dependency ref="LASTNAME"/>
-        <ad:Script>
-            
-                importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-                fullname = new BasicAttribute("fullname");
-                fullname.getValues().add(FIRSTNAME.getValues().get(0) + " " + LASTNAME.getValues().get(0));
-            
-        </ad:Script>
-    </resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="FIRSTNAME">
-        <resolver:Dependency ref="LocalDatabase"/>
-    </resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="LASTNAME">
-        <resolver:Dependency ref="LocalDatabase"/>
-    </resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="email" sourceAttributeID="EMAIL">
-        <resolver:Dependency ref="LocalDatabase"/>
-        <resolver:AttributeEncoder xsi:type="encoder:SAML2String" name="0.9.2342.19200300.100.1.3" friendlyName="email"/>
-    </resolver:AttributeDefinition>
-        
-    <resolver:DataConnector xsi:type="dc:RelationalDatabase" id="LocalDatabase">
-                                       
-        <dc:ApplicationManagedConnection jdbcDriver="org.hsqldb.jdbcDriver" jdbcURL="jdbc:hsqldb:res:/data/database/shibdb" jdbcUserName="sa"/>
-                                                           
-        <dc:QueryTemplate>
-            
-                SELECT * FROM PEOPLE WHERE netid='${requestContext.principalName}'
-            
-        </dc:QueryTemplate>
-        
-    </resolver:DataConnector>
-    
-</AttributeResolver>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-mapped-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-mapped-config.xml.svn-base
deleted file mode 100644
index 2758103..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-mapped-config.xml.svn-base
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" default-autowire="byType">
-
-    <!-- Test Resolver Configurations -->    
-    <bean id="mappedConfig" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-mapped.xml"/>
-    </bean>
-
-    <!-- Test resolver instances -->    
-    <bean id="resolver-mapped" class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="mappedConfig"/>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-mapped.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-mapped.xml.svn-base
deleted file mode 100644
index 900891c..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-mapped.xml.svn-base
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" 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" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xsi:schemaLocation="      urn:mace:shibboleth:2.0:resolver classpath:/schema/shibboleth-2.0-attribute-resolver.xsd       urn:mace:shibboleth:2.0:resolver:dc classpath:/schema/shibboleth-2.0-attribute-resolver-dc.xsd      urn:mace:shib [...]
-
-    <resolver:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver:ad" xsi:type="ad:Mapped" id="eduPersonAffilation" sourceAttributeID="affiliation">
-        <resolver:Dependency ref="static"/>
-
-        <DefaultValue passThru="true"/>
-
-        <ValueMap>
-            <ReturnValue>member</ReturnValue>
-
-            <SourceValue>student</SourceValue>
-            <SourceValue>staff</SourceValue>
-            <SourceValue>faculty</SourceValue>
-        </ValueMap>
-
-        <ValueMap>
-            <ReturnValue>staff</ReturnValue>
-
-            <SourceValue>student-worker-.*</SourceValue>
-        </ValueMap>
-    </resolver:AttributeDefinition>
-
-    <resolver:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver:ad" xsi:type="ad:Mapped" id="firstColor" sourceAttributeID="colors">
-        <resolver:Dependency ref="static"/>
-
-        <ValueMap>
-            <ReturnValue>$1</ReturnValue>
-            <SourceValue>^([^,]*).*</SourceValue>
-        </ValueMap>
-
-    </resolver:AttributeDefinition>
-
-    <!--  test bug SIDP-22 -->
-    <resolver:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver:ad" xsi:type="ad:Mapped" id="fooBar" sourceAttributeID="foo">
-        <resolver:Dependency ref="static"/>
-
-        <ValueMap>
-            <ReturnValue>$1</ReturnValue>
-            <SourceValue>^([^,]*).*</SourceValue>
-        </ValueMap>
-    </resolver:AttributeDefinition>
-    
-    <resolver:DataConnector xmlns="urn:mace:shibboleth:2.0:resolver:dc" xsi:type="dc:Static" id="static">
-        <Attribute id="affiliation">
-            <Value>student</Value>
-            <Value>student-worker-parttime</Value>
-            <Value>parent</Value>
-        </Attribute>
-        <Attribute id="colors">
-            <Value>red,blue,green</Value>
-        </Attribute>
-    </resolver:DataConnector>
-
-</AttributeResolver>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-template-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-template-config.xml.svn-base
deleted file mode 100644
index f7e3f2b..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-template-config.xml.svn-base
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd" default-autowire="byType">
-
-    <!-- Test Resolver Configurations -->
-    <bean id="templateConfig" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/resolver-template.xml"/>
-    </bean>
-    
-    <!-- Test resolver instances -->
-    <bean id="resolver-template" class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.ShibbolethAttributeResolver" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="templateConfig"/>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-template.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-template.xml.svn-base
deleted file mode 100644
index d6004d5..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver-template.xml.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" 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" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xsi:schemaLocation="         urn:mace:shibboleth:2.0:resolver classpath:/schema/shibboleth-2.0-attribute-resolver.xsd         urn:mace:shibboleth:2.0:resolver:dc classpath:/schema/shibboleth-2.0-attribute-resolver-dc.xsd         urn:m [...]
-
-    <resolver:AttributeDefinition xsi:type="ad:PrincipalName" id="principalName"/>
-
-    <resolver:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver:ad" xsi:type="ad:Template" id="courseEnrollment">
-        <resolver:Dependency ref="static"/>
-
-        <Template>
-            
-                urn:mace:example.edu:enrollment:$academic_term:$course_id:$course_section
-            
-        </Template>
-        <SourceAttribute>academic_term</SourceAttribute>
-        <SourceAttribute>course_id</SourceAttribute>
-        <SourceAttribute>course_section</SourceAttribute>
-    </resolver:AttributeDefinition>
-
-    <resolver:DataConnector xmlns="urn:mace:shibboleth:2.0:resolver:dc" xsi:type="dc:Static" id="static">
-        <Attribute id="academic_term">
-            <Value>20073</Value>
-            <Value>20073</Value>
-        </Attribute>
-        <Attribute id="course_id">
-            <Value>eng101</Value>
-            <Value>math203</Value>
-        </Attribute>
-        <Attribute id="course_section">
-            <Value>a3</Value>
-            <Value>2</Value>
-        </Attribute>
-    </resolver:DataConnector>
-
-</AttributeResolver>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver.xml.svn-base
deleted file mode 100644
index b1e9d20..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/.svn/text-base/resolver.xml.svn-base
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" 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 classpath:/schema/shibboleth-2.0-at [...]
-
-    <resolver:AttributeDefinition xsi:type="ad:PrincipalName" id="principalName">
-        
-        <resolver:AttributeEncoder xmlns="urn:mace:shibboleth:2.0:attribute:encoder" xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-
-        <resolver:AttributeEncoder xmlns="urn:mace:shibboleth:2.0:attribute:encoder" xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" friendlyName="eduPersonPrincipalName"/>
-            
-    </resolver:AttributeDefinition>
-
-	<resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAffiliation" sourceAttributeID="affiliation">
-		<resolver:Dependency ref="static"/>
-		<resolver:Dependency ref="static2"/>
-        
-        <resolver:AttributeEncoder xmlns="urn:mace:shibboleth:2.0:attribute:encoder" xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAffiliation"/>
-
-        <resolver:AttributeEncoder xmlns="urn:mace:shibboleth:2.0:attribute:encoder" xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" friendlyName="eduPersonAffiliation"/>
-            
-	</resolver:AttributeDefinition>
-    
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonEntitlement" sourceAttributeID="entitlement">
-        <resolver:Dependency ref="static"/>
-        <resolver:Dependency ref="static2"/>
-        
-        <resolver:AttributeEncoder xmlns="urn:mace:shibboleth:2.0:attribute:encoder" xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonEntitlement"/>
-
-        <resolver:AttributeEncoder xmlns="urn:mace:shibboleth:2.0:attribute:encoder" xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" friendlyName="eduPersonEntitlement"/>
-    </resolver:AttributeDefinition>
-	
-	<resolver:DataConnector xsi:type="dc:Static" id="static">
-		<dc:Attribute id="affiliation">
-			<dc:Value>staff</dc:Value>
-            <dc:Value>student</dc:Value>
-		</dc:Attribute>
-		<dc:Attribute id="entitlement">
-			<dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
-		</dc:Attribute>
-	</resolver:DataConnector>
-
-	<resolver:DataConnector xsi:type="dc:Static" id="static2">
-		<dc:Attribute id="affiliation">
-			<dc:Value>member</dc:Value>
-            <dc:Value>member</dc:Value>
-		</dc:Attribute>
-	</resolver:DataConnector>
-
-</AttributeResolver>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops
deleted file mode 100644
index 4208d55..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/all-wcprops
+++ /dev/null
@@ -1,113 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 129
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata
-END
-InCommon-metadata.xml
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/1049/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml
-END
-ukfederation-metadata.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/1050/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ukfederation-metadata.xml
-END
-Metadata1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 142
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/Metadata1.xml
-END
-InlineMetadataProvider1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InlineMetadataProvider1.xml
-END
-InlineMetadataProvider2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InlineMetadataProvider2.xml
-END
-HTTPMetadataProvider1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPMetadataProvider1.xml
-END
-InlineMetadataProvider3.xml
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InlineMetadataProvider3.xml
-END
-HTTPMetadataProvider2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPMetadataProvider2.xml
-END
-ChainingMetadataProvider1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 159
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProvider1.xml
-END
-InlineMetadataProvider4.xml
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InlineMetadataProvider4.xml
-END
-ChainingMetadataProvider2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 159
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProvider2.xml
-END
-ChainingMetadataProvider3.xml
-K 25
-svn:wc:ra_dav:version-url
-V 159
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ChainingMetadataProvider3.xml
-END
-FilesystemMetadataProvider1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/FilesystemMetadataProvider1.xml
-END
-FilesystemMetadataProvider2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/FilesystemMetadataProvider2.xml
-END
-FilesystemMetadataProvider3.xml
-K 25
-svn:wc:ra_dav:version-url
-V 160
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/FilesystemMetadataProvider3.xml
-END
-HTTPResourceMetadataProvider1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPResourceMetadataProvider1.xml
-END
-HTTPResourceMetadataProvider2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/HTTPResourceMetadataProvider2.xml
-END
-shibboleth.net-metadata.xml
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/shibboleth.net-metadata.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries
deleted file mode 100644
index 514486f..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/entries
+++ /dev/null
@@ -1,640 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-InlineMetadataProvider1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-9841cee82574701ee322159366e18514
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1751
-

-InlineMetadataProvider2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-f390af6b5ec7d655cbd678ead41fc9b8
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1599
-

-HTTPMetadataProvider1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-174d98b0810845dce3b129b496e7fc77
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-575
-

-InlineMetadataProvider3.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-42946b0df29f51ba316ea5c4470aa20d
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-592
-

-HTTPMetadataProvider2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-d7668eb5bdb641ecff917610a331bb2b
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-696
-

-ChainingMetadataProvider1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-1161612992e77a2bcb64118d3b235307
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1285
-

-InlineMetadataProvider4.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-3cefe7c9eec09624f78447fd83eee5ee
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1845
-

-ChainingMetadataProvider2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-ad6dd3211e47c342cafffb02720dc38f
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1395
-

-ChainingMetadataProvider3.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-20f97b67b0e7829596b26cd50380398d
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1866
-

-FilesystemMetadataProvider1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.246729Z
-ba4f36ac7f39033561579e1d52b8a65b
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-449
-

-FilesystemMetadataProvider2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.246729Z
-219cf77cce0d8bb7cfd99cdd91f8e216
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-359
-

-FilesystemMetadataProvider3.xml
-file
-
-
-
-
-2014-02-19T17:27:40.246729Z
-af704e514ab290b12f47398be51e60a4
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-570
-

-HTTPResourceMetadataProvider1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.246729Z
-712269fa7bb7143e83af657a510d6707
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-781
-

-HTTPResourceMetadataProvider2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.246729Z
-5007aa766a00d9ea1821fe65898ebcea
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-871
-

-shibboleth.net-metadata.xml
-file
-
-
-
-
-2014-02-19T17:27:40.246729Z
-7811bd4816374631102f05d1c04b12ed
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-20938
-

-InCommon-metadata.xml
-file
-
-
-
-
-2014-02-19T17:27:40.246729Z
-812163b7017f2d8ec4208d4b999b725d
-2013-01-23T19:13:44.124472Z
-1049
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-61801
-

-ukfederation-metadata.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-ce94fea8417598d4a8042b9442f92de7
-2013-01-23T19:48:53.732724Z
-1050
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-292136
-

-Metadata1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.250729Z
-a601d2774540346c8322f85cacee6b3d
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1411
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider3.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ChainingMetadataProvider3.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider3.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/FilesystemMetadataProvider3.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProvider1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProvider2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPResourceMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPResourceMetadataProvider1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPResourceMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPResourceMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPResourceMetadataProvider2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/HTTPResourceMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InCommon-metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InCommon-metadata.xml.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InCommon-metadata.xml.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider3.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider3.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider4.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider4.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/InlineMetadataProvider4.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/Metadata1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/Metadata1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/Metadata1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/shibboleth.net-metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/shibboleth.net-metadata.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/shibboleth.net-metadata.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ukfederation-metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ukfederation-metadata.xml.svn-base
deleted file mode 100644
index bdbd305..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/prop-base/ukfederation-metadata.xml.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider1.xml.svn-base
deleted file mode 100644
index 36f3ed8..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:shibres="urn:mace:shibboleth:2.0:resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ChainingMetadata" xsi:type="shibmd:ChainingMetadataProvider" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd                                              urn:mace:shibboleth:2.0:resource classpath:/schema/shibboleth-2.0-resource.xsd">
-
-    <shibmd:MetadataProvider id="ResourceMetadataIC" xsi:type="shibmd:ResourceBackedMetadataProvider">
-        <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml"/>
-    </shibmd:MetadataProvider>
-    
-    <shibmd:MetadataProvider id="ResourceMetadataUK" xsi:type="shibmd:ResourceBackedMetadataProvider">
-        <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ukfederation-metadata.xml"/>
-    </shibmd:MetadataProvider>
-
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider2.xml.svn-base
deleted file mode 100644
index afcc1dd..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:shibres="urn:mace:shibboleth:2.0:resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ChainingMetadata" xsi:type="shibmd:ChainingMetadataProvider" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd                                              urn:mace:shibboleth:2.0:resource classpath:/schema/shibboleth-2.0-resource.xsd">
-                                             
-    <shibmd:MetadataFilter xsi:type="shibmd:SchemaValidation"/>
-
-    <shibmd:MetadataProvider id="ResourceMetadataIC" xsi:type="shibmd:ResourceBackedMetadataProvider">
-        <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml"/>
-    </shibmd:MetadataProvider>
-    
-    <shibmd:MetadataProvider id="ResourceMetadataUK" xsi:type="shibmd:ResourceBackedMetadataProvider">
-        <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ukfederation-metadata.xml"/>
-    </shibmd:MetadataProvider>
-
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider3.xml.svn-base
deleted file mode 100644
index 4523127..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ChainingMetadataProvider3.xml.svn-base
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:shibres="urn:mace:shibboleth:2.0:resource" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ChainingMetadata" xsi:type="shibmd:ChainingMetadataProvider" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd                                              urn:mace:shibboleth:2.0:resource classpath:/schema/shibbole [...]
-                                             
-
-    <shibmd:MetadataProvider id="ResourceMetadataIC" xsi:type="shibmd:ResourceBackedMetadataProvider">
-        <shibmd:MetadataFilter xsi:type="shibmd:EntityRoleWhiteList">
-            <shibmd:RetainedRole>md:IDPSSODescriptor</shibmd:RetainedRole> 
-        </shibmd:MetadataFilter>
-        <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml"/>
-    </shibmd:MetadataProvider>
-    
-    <shibmd:MetadataProvider id="ResourceMetadataUK" xsi:type="shibmd:ResourceBackedMetadataProvider">
-        <shibmd:MetadataFilter xsi:type="shibmd:EntityRoleWhiteList">
-            <shibmd:RetainedRole>md:IDPSSODescriptor</shibmd:RetainedRole> 
-        </shibmd:MetadataFilter>
-        <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/ukfederation-metadata.xml"/>
-    </shibmd:MetadataProvider>
-
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider1.xml.svn-base
deleted file mode 100644
index cf4946d..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="FilesystemMetadata" metadataFile="src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/Metadata1.xml" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd" xsi:type="shibmd:FilesystemMetadataProvider"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider2.xml.svn-base
deleted file mode 100644
index 9835415..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="FilesystemMetadata" metadataFile="nofile" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd" xsi:type="shibmd:FilesystemMetadataProvider"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider3.xml.svn-base
deleted file mode 100644
index 98c0f62..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/FilesystemMetadataProvider3.xml.svn-base
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="FilesystemMetadata" metadataFile="src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/Metadata1.xml" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd" xsi:type="shibmd:FilesystemMetadataProvider">
-                         
-    <shibmd:MetadataFilter xsi:type="shibmd:SchemaValidation"/>
-    
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProvider1.xml.svn-base
deleted file mode 100644
index 61a0460..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="URLMetadata" metadataURL="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml" requireValidMetadata="true" maxRefreshDelay="PT2H" requestTimeout="PT3S" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xs [...]
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProvider2.xml.svn-base
deleted file mode 100644
index 90d595e..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="URLMetadata" metadataURL="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml" requireValidMetadata="true" maxRefreshDelay="PT2H" requestTimeout="PT3S" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xs [...]
-                         
-    <shibmd:MetadataFilter xsi:type="shibmd:SchemaValidation"/>
-    
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPResourceMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPResourceMetadataProvider1.xml.svn-base
deleted file mode 100644
index 970d1b0..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPResourceMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:shibres="urn:mace:shibboleth:2.0:resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ResourceMetadata" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd                                              urn:mace:shibboleth:2.0:resource classpath:/schema/shibboleth-2.0-resource.xsd" xsi:type="shibmd:ResourceBackedMetadataProvider">
-    
-    <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml"/>
-    
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPResourceMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPResourceMetadataProvider2.xml.svn-base
deleted file mode 100644
index 1c526c6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/HTTPResourceMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:shibres="urn:mace:shibboleth:2.0:resource" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ResourceMetadata" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd                                              urn:mace:shibboleth:2.0:resource classpath:/schema/shibboleth-2.0-resource.xsd" xsi:type="shibmd:ResourceBackedMetadataProvider">
-                         
-    <shibmd:MetadataFilter xsi:type="shibmd:SchemaValidation"/>
-    
-    <shibmd:MetadataResource xsi:type="shibres:HttpResource" url="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml"/>
-    
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InCommon-metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InCommon-metadata.xml.svn-base
deleted file mode 100644
index 09c7325..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InCommon-metadata.xml.svn-base
+++ /dev/null
@@ -1,1113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:incommon" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:SignedInfo>
-<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-<ds:Reference URI="">
-<ds:Transforms>
-<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-</ds:Transforms>
-<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-<ds:DigestValue>91oiRc8Bwf+DJq/kO/4vQh723F8=</ds:DigestValue>
-</ds:Reference>
-</ds:SignedInfo>
-<ds:SignatureValue>
-txodSjGrZlegJY9lHLlxfhOpK0v8SGNmFFHPXM9j54gZdbK+N8+4rPEjVCOg33Bk8RZ+OcBQNQQH
-otCvlXEpput84qTDVbe8xIGXzTbRH+45oLV6PQCEvZ4Pd3W/D2BZmI77DLHOlsQFJW2B6Ct98sO6
-qvWi7hStX8qaPnZe3hpDOgdhNpfZh/WiY5VTPsYT/+KHFv1wM3AqIPUKJ/9q6ahD80NlpJzpliE9
-PbEnEiuUKWq255jNBnbl/xR4jN+MhX1pOzxD1x+tDqJLVL+rgoHQZJHoxHzYykRKW4FITRL0ASXZ
-lgKxBy5k/W0hPzm4ntrX3OvpW49S0ys3BlAEWQ==
-</ds:SignatureValue>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIF2zCCBMOgAwIBAgIBQjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-SW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwHhcNMDYwNDEwMTY1NjM3WhcNMDcwNDEwMTY1NjM3WjBSMQswCQYDVQQGEwJVUzEcMBoG
-A1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjElMCMGA1UEAxMcZmVkb3AuaW5jb21tb25mZWRlcmF0
-aW9uLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAoXZK5/nRuWY+S91CMPsXl
-oDc5vGo8O/xcqkUNUow+C34NlgnZX4zq2BjZ1WTAk3yLaF00qYOK18R0LMpHjYmEbtvtNrjEvtaZ
-walo83TyRNKHfqvBG3bxOkoYpo8jZ9MkHxskCgjXWLnPu+TCB7GiDgBLQ2VEk/UneKHlNc0Y1drB
-r1HfiRR73lAIUXNG/iRGXyBLqvyyFPasZv/oBWmsJZqI2T8jlmdSZbMG66yWGMp9dKoJyb44fYGV
-lyo5j8arxyiXAEz4QIdoFhmm1k1wSQnJDHtYaxwpf72wywps9P6GLqGkg8z+sxPWEgP8QqZWhwNJ
-qAtVbNh+TDkBpXsCAwEAAaOCArYwggKyMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQU5ij9YLU5zQ6K75kPgVpyQ2N/
-lPswfgYDVR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRww
-GgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGaaHR0cDov
-L2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRz
-LnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlo
-dHRwOi8vaW5jb21tb25jcmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmww
-P6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVj
-cmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9p
-bmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJhY3RpY2VzLnBkZjAnBgNVHREEIDAe
-ghxmZWRvcC5pbmNvbW1vbmZlZGVyYXRpb24ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQDNwpH5FdVi
-qXKwN51xRQhSabH04DIFo9tnGWA/U2MOH1Gwh2Vt0JzlxZ5gZrsUM9gQBMLmifjxB29rY2xnhhjW
-FJhoTsI2F2KPav6W5Eqykq3yDV06oqNq0N0yMtB+og2yCIIZFvEG0wTKyv2n3bZqNaXz9r808b7p
-v/OVPW4HnmUtfFDg8q7C4Y2wbWqBYINkOi4lVbKzi2Sk5nVohuRGBja7eTYlpBP3nF+E/xb49JxQ
-AErc8wFZhJJdKNBnGWKOxelxC4nwda+g3mcc2T6REM0OUU7ArAlOdXW1eYNtflZe1G4qJ+6lTbpx
-8unyNnbIxDshbno8FbG0gIXOQ/4s
-</ds:X509Certificate>
-<ds:X509Certificate>
-MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-SW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoG
-A1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx
-82/CWPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yuoUDA754I
-f0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhPtzcDR33gtaAb3oilZ+ZT
-pnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOzD1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+
-zbkCge6wgipZyXxaOAam6ncqmkxy+hy/OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJIS
-XhC4RAReA0HyBp/wd0iDAgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRitY+Ob
-ZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0
-aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBugYIKwYB
-BQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGaaHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVk
-ZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6
-aHR0cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
-LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwxLmluY29t
-bW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNy
-bDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysG
-AQQBriMBBAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvcHJhY3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlF
-TMlUGspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxkpwn410si
-umxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyjuJg/JQz1LnHMocIW/Jli
-gloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGEZqrCXL0FMZLSr+Vady/tFbVojqI8pSub
-SMxNkZectePTBjVj1Qeb4hmG8jRv/fwy1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTw
-nP7Nhfotgaxf5wG8WA==
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo></ds:Signature>
-  <Extensions>
-    <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-      <!-- InCommon CA -->
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
-MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
-dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
-WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
-oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
-tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
-D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
-OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
-AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
-Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
-bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
-aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
-L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
-Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
-LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
-cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
-OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
-ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
-AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
-Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
-GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
-pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
-uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
-ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
-1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </shibmd:KeyAuthority>
-  </Extensions>
-
-<EntityDescriptor entityID="urn:mace:incommon:internet2.edu">
-   <IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>origin.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.internet2.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>origin.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://origin.internet2.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Internet2</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en"/>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="urn:mace:incommon:dartmouth.edu">
-    <IDPSSODescriptor errorURL="http://giza.dartmouth.edu/shibboleth/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>giza.dartmouth.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://giza.dartmouth.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor errorURL="http://giza.dartmouth.edu/shibboleth/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>giza.dartmouth.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://giza.dartmouth.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Dartmouth College</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Dartmouth College</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.dartmouth.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Robert Brentrup</GivenName>
-      <EmailAddress>Robert.J.Brentrup at dartmouth.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Robert Brentrup</GivenName>
-      <EmailAddress>Robert.J.Brentrup at dartmouth.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:rochester.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.its.rochester.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.its.rochester.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.its.rochester.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.its.rochester.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Rochester</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Rochester</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.rochester.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Sean Singh</GivenName>
-      <EmailAddress>sean.singh at rochester.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Sean Singh</GivenName>
-      <EmailAddress>sean.singh at rochester.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Charles Yanaitis</GivenName>
-      <EmailAddress>charles.yanaitis at rochester.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:osu.edu">
-   <IDPSSODescriptor errorURL="https://webauth.service.ohio-state.edu/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>webauth.service.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/shibboleth/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.service.ohio-state.edu/shibboleth/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>webauth.service.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Ohio State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Ohio State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.osu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Scott Cantor</GivenName>
-      <EmailAddress>cantor.2 at osu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Scott Cantor</GivenName>
-      <EmailAddress>cantor.2 at osu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:uci.edu">
-   <IDPSSODescriptor errorURL="http://shib.nacs.uci.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu/shibboleth-idp/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nacs.uci.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Irvine</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Irvine</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="urn:mace:incommon:buffalo.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">buffalo.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.buffalo.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.buffalo.edu/shibboleth-ext/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">buffalo.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.buffalo.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.buffalo.edu:7443/shibboleth-ext/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">The State University of New York at Buffalo</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The State University of New York at Buffalo</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.buffalo.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Charles Dunn</GivenName>
-      <EmailAddress>chuck at buffalo.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>John A Ball</GivenName>
-      <EmailAddress>auth-support at gory.acsu.buffalo.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Joel W. Murphy</GivenName>
-      <EmailAddress>jmurphy at buffalo.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:washington.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>hs.so.cac.washington.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hs.so.cac.washington.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>hs.so.cac.washington.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.so.cac.washington.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Washington</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Washington</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.washington.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Nathan Dors</GivenName>
-      <EmailAddress>dors at cac.washington.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Nathan Dors</GivenName>
-      <EmailAddress>pubcookie at cac.washington.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:cornell.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiborigin.cit.cornell.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiborigin.cit.cornell.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Cornell University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cornell.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Andrea Beesing</GivenName>
-      <EmailAddress>amb3 at cornell.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Steve Edgar</GivenName>
-      <EmailAddress>se10 at cornell.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Ron DiNapoli</GivenName>
-      <EmailAddress>rd29 at cornell.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:psu.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>as1.fim.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://as1.fim.psu.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>as1.fim.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Technical Staff</GivenName>
-      <EmailAddress>root at aset.psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Kevin Morooney</GivenName>
-      <EmailAddress>kxm at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Mark Miller</GivenName>
-      <EmailAddress>max at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:usc.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib1.usc.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.usc.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib1.usc.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.usc.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Southern California</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Southern California</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.usc.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Cecelia E. Henderson</GivenName>
-      <EmailAddress>shelley at usc.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Phil Dibowitz</GivenName>
-      <EmailAddress>phil at usc.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:ucsd.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>a4.ucsd.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://a4.ucsd.edu/tritON/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>a4.ucsd.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://a4.ucsd.edu:8443/tritON/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of California-San Diego</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-San Diego</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ucsd.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Crystal Harris</GivenName>
-      <EmailAddress>crys at ucsd.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Anthony R. Wood</GivenName>
-      <EmailAddress>twood at ucsd.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Anthony R. Wood</GivenName>
-      <EmailAddress>twood at ucsd.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:ohio.edu">
-    <IDPSSODescriptor errorURL="https://shibboleth.ohio.edu" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.ohio.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ohio.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor errorURL="https://shibboleth.ohio.edu" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.ohio.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ohio.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Ohio University Main Campus</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Ohio University Main Campus</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ohiou.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Todd Acheson</GivenName>
-      <EmailAddress>acheson at ohio.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Vitaliy Shipitsyn</GivenName>
-      <EmailAddress>vshipits at ohio.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>David Alexander</GivenName>
-      <EmailAddress>alexandd at ohio.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-<EntityDescriptor entityID="https://getz.internet2.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>getz.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://getz.internet2.edu/Shibboleth.sso/SAML/POST" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://getz.internet2.edu/Shibboleth.shire" index="0"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Internet2</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en"/>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-  <EntityDescriptor entityID="https://www.internet2.edu/shibboleth">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.internet2.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www.internet2.edu/Shibboleth.shire" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.internet2.edu/Shibboleth.shire" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Internet2 Web Site</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2 Web Site</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="https://sdauth.sciencedirect.com/">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth-cert3.sciencedirect.com/SHIRE" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">ScienceDirect</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">ScienceDirect</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.sciencedirect.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-
-<EntityDescriptor entityID="https://wiki.it.ohio-state.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>wiki.it.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="1" isDefault="true"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="2"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="3"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="4"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Ohio State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Ohio State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.osu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Webauth Technical Support Staff</GivenName>
-      <EmailAddress>webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Webauth Technical Support Staff</GivenName>
-      <EmailAddress>webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="http://www.sciencedirect.com/">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">ScienceDirect</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">ScienceDirect</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.sciencedirect.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="https://shib.dev.oclc.org/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.dev.oclc.org</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://shib.dev.oclc.org:2080/Shibboleth.shire" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.dev.oclc.org:2443/Shibboleth.shire" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Online Computer Library Center Inc.</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Online Computer Library Center Inc.</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.oclc.org</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>allene at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>allene at oclc.org</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-<EntityDescriptor entityID="https://shib.oclc.org/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.oclc.org</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.shire" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://shib.oclc.org:2080/Shibboleth.shire" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Online Computer Library Center Inc.</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Online Computer Library Center Inc.</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.oclc.org</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Sharon Ramsay</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Richard Scranton</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="https://shibtest.nac.uci.edu/cgi-bin/printenv">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibtest.nac.uci.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.nac.uci.edu/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">UCIs InCommon Demo Resource</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">UCIs InCommon Demo Resource</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-  <EntityDescriptor entityID="https://share.internet2.edu/shibboleth">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>share.internet2.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://share.internet2.edu/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Internet2 Wiki</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2 Wiki</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="https://www.webassign.net/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>www.webassign.net</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webassign.net/Shibboleth.sso" index="0"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">WebAssign</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">WebAssign</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.webassign.net/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Brian Marks</GivenName>
-      <EmailAddress>brian at webassign.net</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:cornell.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiborigin.cit.cornell.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiborigin.cit.cornell.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Cornell University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cornell.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Todd Zino</GivenName>
-      <EmailAddress>tcz3 at cornell.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Pete Bosanko</GivenName>
-      <EmailAddress>pb10 at cornell.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Andrea Beesing</GivenName>
-      <EmailAddress>amb3 at cornell.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:case.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shibb.case.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.case.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shibb.case.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Case Western Reserve University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Case Western Reserve University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cwru.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Jeremy Smith</GivenName>
-      <EmailAddress>jeremy.smith at case.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>David Kovacic</GivenName>
-      <EmailAddress>david.kovacic at case.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://www.e-education.psu.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>www.e-education.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.e-education.psu.edu/Shibboleth.sso/SAML/POST" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.e-education.psu.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Jeff Buechler</GivenName>
-      <EmailAddress>jdb11 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Jeff Wolfe</GivenName>
-      <EmailAddress>wolfe at ems.psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://angelshibaccept.ais.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>angelshibaccept.ais.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://angelshibaccept.ais.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://shib.cms.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.cms.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.cms.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://shib.nacs.uci.edu/cgi-bin/printenv">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.nacs.uci.edu/Shibboleth.sso/SAML/POST" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.nacs.uci.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Irvine</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Irvine</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://cms.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>cms.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cms.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:ucla.edu">
-   <IDPSSODescriptor errorURL="https://shb.ais.ucla.edu/shibboleth-idp/WAYFerror" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shb.ais.ucla.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu/shibboleth-idp/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shb.ais.ucla.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shb.ais.ucla.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Los Angeles</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Los Angeles</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ucla.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Datta Mahabalagiri</GivenName>
-      <EmailAddress>datta at ais.ucla.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Albert Wu</GivenName>
-      <EmailAddress>albertwu at ucla.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider1.xml.svn-base
deleted file mode 100644
index 780ea86..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider1.xml.svn-base
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="InlineMetadata" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd urn:oasis:names:tc:SAML:2.0:metadata classpath:/schema/saml-schema-metadata-2.0.xsd " xsi:type="shibmd:InlineMetadataProvider">
-                         
-    <samlmd:EntitiesDescriptor Name="urn:mace:incommon">
-    
-        <samlmd:EntityDescriptor entityID="urn:mace:incommon:internet2.edu">
-            <samlmd:IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-                <samlmd:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</samlmd:NameIDFormat>
-                <samlmd:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.internet2.edu/shibboleth/HS"/>
-            </samlmd:IDPSSODescriptor>
-            <samlmd:Organization>
-                <samlmd:OrganizationName xml:lang="en">Internet2</samlmd:OrganizationName>
-                <samlmd:OrganizationDisplayName xml:lang="en">Internet2</samlmd:OrganizationDisplayName>
-                <samlmd:OrganizationURL xml:lang="en"/>
-            </samlmd:Organization>
-            <samlmd:ContactPerson contactType="technical">
-                <samlmd:GivenName>IJ Kim</samlmd:GivenName>
-                <samlmd:EmailAddress>ij at internet2.edu</samlmd:EmailAddress>
-            </samlmd:ContactPerson>
-        </samlmd:EntityDescriptor>
-
-    </samlmd:EntitiesDescriptor>
-
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider2.xml.svn-base
deleted file mode 100644
index 0c63e25..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider2.xml.svn-base
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="InlineMetadata" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd urn:oasis:names:tc:SAML:2.0:metadata classpath:/schema/saml-schema-metadata-2.0.xsd " xsi:type="shibmd:InlineMetadataProvider">
-                             
-    <samlmd:EntityDescriptor entityID="urn:mace:incommon:internet2.edu">
-        <samlmd:IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-            <samlmd:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</samlmd:NameIDFormat>
-            <samlmd:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.internet2.edu/shibboleth/HS"/>
-        </samlmd:IDPSSODescriptor>
-        <samlmd:Organization>
-            <samlmd:OrganizationName xml:lang="en">Internet2</samlmd:OrganizationName>
-            <samlmd:OrganizationDisplayName xml:lang="en">Internet2</samlmd:OrganizationDisplayName>
-            <samlmd:OrganizationURL xml:lang="en"/>
-        </samlmd:Organization>
-        <samlmd:ContactPerson contactType="technical">
-            <samlmd:GivenName>IJ Kim</samlmd:GivenName>
-            <samlmd:EmailAddress>ij at internet2.edu</samlmd:EmailAddress>
-        </samlmd:ContactPerson>
-    </samlmd:EntityDescriptor>
-
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider3.xml.svn-base
deleted file mode 100644
index 7fa1e6b..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider3.xml.svn-base
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="InlineMetadata" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd                                               urn:oasis:names:tc:SAML:2.0:metadata classpath:/schema/saml-schema-metadata-2.0.xsd" xsi:type="shibmd:InlineMetadataProvider">
-                         
-    <samlmd:NoSuchElement/>
-
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider4.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider4.xml.svn-base
deleted file mode 100644
index c9e5e41..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/InlineMetadataProvider4.xml.svn-base
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:MetadataProvider xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="InlineMetadata" xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata classpath:/schema/shibboleth-2.0-metadata.xsd urn:oasis:names:tc:SAML:2.0:metadata classpath:/schema/saml-schema-metadata-2.0.xsd " xsi:type="shibmd:InlineMetadataProvider">
-                         
-    <shibmd:MetadataFilter xsi:type="shibmd:SchemaValidation"/>
-                         
-    <samlmd:EntitiesDescriptor Name="urn:mace:incommon">
-    
-        <samlmd:EntityDescriptor entityID="urn:mace:incommon:internet2.edu">
-            <samlmd:IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-                <samlmd:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</samlmd:NameIDFormat>
-                <samlmd:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.internet2.edu/shibboleth/HS"/>
-            </samlmd:IDPSSODescriptor>
-            <samlmd:Organization>
-                <samlmd:OrganizationName xml:lang="en">Internet2</samlmd:OrganizationName>
-                <samlmd:OrganizationDisplayName xml:lang="en">Internet2</samlmd:OrganizationDisplayName>
-                <samlmd:OrganizationURL xml:lang="en"/>
-            </samlmd:Organization>
-            <samlmd:ContactPerson contactType="technical">
-                <samlmd:GivenName>IJ Kim</samlmd:GivenName>
-                <samlmd:EmailAddress>ij at internet2.edu</samlmd:EmailAddress>
-            </samlmd:ContactPerson>
-        </samlmd:EntityDescriptor>
-
-    </samlmd:EntitiesDescriptor>
-    
-</shibmd:MetadataProvider>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/Metadata1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/Metadata1.xml.svn-base
deleted file mode 100644
index f4019db..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/Metadata1.xml.svn-base
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<samlmd:EntitiesDescriptor xmlns:samlmd="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:incommon" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata classpath:/schema/saml-schema-metadata-2.0.xsd ">
-
-    <samlmd:EntityDescriptor entityID="urn:mace:incommon:internet2.edu">
-        <samlmd:IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-            <samlmd:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</samlmd:NameIDFormat>
-            <samlmd:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.internet2.edu/shibboleth/HS"/>
-        </samlmd:IDPSSODescriptor>
-        <samlmd:Organization>
-            <samlmd:OrganizationName xml:lang="en">Internet2</samlmd:OrganizationName>
-            <samlmd:OrganizationDisplayName xml:lang="en">Internet2</samlmd:OrganizationDisplayName>
-            <samlmd:OrganizationURL xml:lang="en"/>
-        </samlmd:Organization>
-        <samlmd:ContactPerson contactType="technical">
-            <samlmd:GivenName>IJ Kim</samlmd:GivenName>
-            <samlmd:EmailAddress>ij at internet2.edu</samlmd:EmailAddress>
-        </samlmd:ContactPerson>
-    </samlmd:EntityDescriptor>
-
-</samlmd:EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/shibboleth.net-metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/shibboleth.net-metadata.xml.svn-base
deleted file mode 100644
index 8355e9e..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/shibboleth.net-metadata.xml.svn-base
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="http://shibboleth.net">
-    
-    <EntityDescriptor entityID="https://idp.shibboleth.net/idp/shibboleth">
-       
-        <Extensions>
-            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-            <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-            <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-            
-            <mdattr:EntityAttributes>
-                <saml:Attribute Name="urn:example.org:policies">
-                    <saml:AttributeValue>urn:example.org:policy:ABCD</saml:AttributeValue>
-                    <saml:AttributeValue>urn:example.org:policy:1234</saml:AttributeValue>
-                </saml:Attribute>
-                <saml:Attribute Name="urn:example.org:entitlements" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-                    <saml:AttributeValue>urn:example.org:entitlements:ABCD</saml:AttributeValue>
-                    <saml:AttributeValue>urn:example.org:entitlements:1234</saml:AttributeValue>
-                </saml:Attribute>
-            </mdattr:EntityAttributes>
-        </Extensions>
-
-        <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-            
-            <Extensions>
-                <shibmd:Scope regexp="false">shibboleth.net</shibmd:Scope>
-                
-                <mdui:UIInfo>
-                    <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
-                    <mdui:Description xml:lang="en">An identity provider hosted and used by the developers of Shibboleth.</mdui:Description>
-                    <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-                </mdui:UIInfo>
-            </Extensions>
-            
-            <KeyDescriptor>
-                <ds:KeyInfo>
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-                            MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
-                            BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
-                            MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
-                            dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA
-                            M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq
-                            5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5
-                            /0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599
-                            pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/
-                            LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3
-                            y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw
-                            czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-                            3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj
-                            3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH
-                            egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5
-                            +A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7
-                            iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce
-                            Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx
-                            BXD36HfGBXk= </ds:X509Certificate>
-                    </ds:X509Data>
-
-                </ds:KeyInfo>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-            </KeyDescriptor>
-            
-            <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
-            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.net/idp/profile/SAML2/POST/SSO"/>
-            
-            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-            
-            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
-        </IDPSSODescriptor>
-        
-        <Organization>
-            <OrganizationName xml:lang="en">Shibboleth.net</OrganizationName>
-            <OrganizationDisplayName xml:lang="en">Shibboleth.net</OrganizationDisplayName>
-            <OrganizationURL xml:lang="en">http://www.shibboleth.net</OrganizationURL>
-        </Organization>
-        <ContactPerson contactType="support">
-            <GivenName>Shibboleth.Net Technical Support</GivenName>
-            <EmailAddress>contact at shibboleth.net</EmailAddress>
-        </ContactPerson>
-        
-    </EntityDescriptor>
-    
-    <EntityDescriptor entityID="https://issues.shibboleth.net/shibboleth">
-
-        <Extensions>
-            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-            <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-            <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-        </Extensions>
- 
-        <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-            
-            <Extensions>
-                <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login"/>
-
-                <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="1"/>
-                
-                <mdui:UIInfo>
-                    <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
-                    <mdui:Description xml:lang="en">
-                        The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
-                        Unauthenticated users may view submitted issues.  Authenticated users may submit new 
-                        issues and comment on existing ones.
-                    </mdui:Description>
-                    <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-                </mdui:UIInfo>                
-            </Extensions>
-
-            
-            <KeyDescriptor>
-                <ds:KeyInfo>
-                    <ds:KeyName>issues.shibboleth.net</ds:KeyName>
-                    <ds:X509Data>
-                        <ds:X509SubjectName>CN=issues.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
-                        <ds:X509Certificate>
-MIIDRjCCAi6gAwIBAgIJAPpEsjMpUtq9MA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
-kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
-VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTEwMTA3MTg0MTQ4WhcNMTQw
-MTA2MTg0MTQ4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
-GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
-+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
-f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
-ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
-y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
-3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
-AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
-AQEFBQADggEBAEzcImXrjUNZF/8AbpcDOqlBO/neTxE0Lcnv4HevHmjqVaemxXK5
-E2pAIJexcyCnp4EV7EK+5hpkr5J26iESHr3w4u/BvUvgSLNjlrIFw58mpBM9f+Qe
-q5bQWff+dmkhrxdhaIVraH70bsuxVKwycmUS0L11nOTxAQbh85wJbIwqH4fKAzQm
-jPp4VbLesRmUyDV+fY4YrZXHYosfuZLEexJgmgcRgZFug6NbWTclKnxKPhquYjem
-oHlA8E0OvkQswalMPLfSzhgftYNHohjdQ2oMBUC4uMk9T+r7ZeKkeCiXIzUzEh8M
-uQfWf/K4Fj4CqCzMOU3mmvy7ricwz/4Kzas=
-                           </ds:X509Certificate>
-                    </ds:X509Data>
-
-                </ds:KeyInfo>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-            </KeyDescriptor>
-            
-            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
-
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-
-            
-            <AttributeConsumingService index="1">
-                <ServiceName xml:lang="en">Shibboleth Federated Issue Tracking</ServiceName>
-                <ServiceDescription xml:lang="en"> An issue (bugs, feature requests, tasks) tracking 
-                    service with automatic registration for users who can supply a supported identifier, 
-                    such as eduPersonPrincipalName or swissEduPersonUniqueID. </ServiceDescription>
-                <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-                <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-                <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            </AttributeConsumingService>
-
-        </SPSSODescriptor>
-        
-        <Organization>
-            <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
-            <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
-            <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-        </Organization>
-        <ContactPerson contactType="support">
-            <GivenName>Shibboleth.Net Technical Support</GivenName>
-            <EmailAddress>contact at shibboleth.net</EmailAddress>
-        </ContactPerson>
-        
-    </EntityDescriptor>
-    
-    <EntityDescriptor entityID="https://wiki.shibboleth.net/shibboleth">
-
-        <Extensions>
-            <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-
-            <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-            <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-            <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-        </Extensions>
-        
-        <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-            
-            <Extensions>
-                <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login"/>
-
-                <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="1"/>
-
-                
-                <mdui:UIInfo>
-                    <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
-                    <mdui:Description xml:lang="en">
-                        The wiki hosting the documentation for Shibboleth.  Unauthenticated user may view the existing
-                        documentation.  Authenticated users may create new documentation pages and edit existing ones.
-                    </mdui:Description>
-                    <mdui:Logo height="82" width="64">https://discovery.shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-                </mdui:UIInfo>
-            </Extensions>
-
-            <KeyDescriptor>
-                <ds:KeyInfo>
-                    <ds:KeyName>wiki.shibboleth.net</ds:KeyName>
-                    <ds:X509Data>
-                        <ds:X509SubjectName>CN=wiki.shibboleth.net,DC=shibboleth,DC=net</ds:X509SubjectName>
-                        <ds:X509Certificate>
-MIIDQjCCAiqgAwIBAgIJAKMO1kGnu43yMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
-kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
-VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTExMDEwNzE4NDIzN1oXDTE0MDEw
-NjE4NDIzN1owTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
-CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
-r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
-iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
-SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
-KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
-m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
-ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
-AAOCAQEAEv6zwotAweOLEfibTXm5d6odE2o/+rHdeEW+IEAspAvmCK7nAPFkuV47
-WMn7JmOd7BWnoXmqFwefJFf3mZtadHnCXReSd8ehGA8/KerSxz9yClMaoanRTEb3
-chT+n5Oh2+WgjzR/v5RbChihoOES+Z2mcvbDm9wn3uSBdxbAoG0/YZihaY9LeoNW
-/CVXv0HYfDw5csol6zwz6dgUDXpfXSXLLKnrjVwARM6lVh00i5i2nfmrWnI41bRh
-NtrvvBkq2tvnd6wm1DJNDzZQB/nRpCadwp4a64Qa0XJiGCoxFUvkd1+RSHqbBsEF
-6w3nDMcYq/BKnF30KZ0Q274eVyQolg==
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-
-                </ds:KeyInfo>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-            </KeyDescriptor>
-            
-            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
-
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
-            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
-            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-
-            
-            <AttributeConsumingService index="1">
-                <ServiceName xml:lang="en">Shibboleth Federated Wiki</ServiceName>
-                <ServiceDescription xml:lang="en"> A shared Wiki service with automatic registration
-                    for users who can supply a supported identifier, such as eduPersonPrincipalName
-                    or swissEduPersonUniqueID. </ServiceDescription>
-                <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-                <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-                <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            </AttributeConsumingService>
-
-        </SPSSODescriptor>
-        
-        <Organization>
-            <OrganizationName xml:lang="en">Shibboleth Consortium</OrganizationName>
-            <OrganizationDisplayName xml:lang="en">Shibboleth Consortium</OrganizationDisplayName>
-            <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-        </Organization>
-        <ContactPerson contactType="support">
-            <GivenName>Shibboleth.Net Technical Support</GivenName>
-            <EmailAddress>contact at shibboleth.net</EmailAddress>
-        </ContactPerson>
-    </EntityDescriptor>
-    
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ukfederation-metadata.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ukfederation-metadata.xml.svn-base
deleted file mode 100644
index 6d90736..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/.svn/text-base/ukfederation-metadata.xml.svn-base
+++ /dev/null
@@ -1,5786 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	***DO NOT EDIT THIS FILE***
-
-	Generated by:
-
-	master_ukfederation.xsl,v 1.3 2006/11/07 20:36:31 iay Exp 
--->
-<!--
-	U K   F E D E R A T I O N   M E T A D A T A
--->
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="http://ukfederation.org.uk" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd   urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd   http://www.w3.org/2001/04/xmlenc# xenc-schema.xsd   http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:SignedInfo>
-<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-<ds:Reference URI="">
-<ds:Transforms>
-<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-</ds:Transforms>
-<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-<ds:DigestValue>NUKHf0O/IE3wtBS5Srw6kCIh5Cw=</ds:DigestValue>
-</ds:Reference>
-</ds:SignedInfo>
-<ds:SignatureValue>
-ULpo8pZDqmWS23tRU4wqWO+H5jHtAvhcn9aIkIelFmgmrq/3XK2dxwiuy9Y6guCBdfhuFMSQ5ihT
-i5a9X7CxfR/LYC0fghhZuooOT9NwQdjLlDS8tKTZuT/wDQsx9YX48xdQCdmSgkiT7Y/qsfln8sya
-GebVGNAdaBb/uNBgSThfn43r3fEK1VdvCxOJFeIY4nnr/KY5WIBcLCweOiSDgXwOIqIFEyznfbxF
-NITzx7HJ1pEsMzHpLYFVRmPs/OZBRjo0feGsHMJeOqPR251KCy10L4jFpxXM7vreN05/yHJqbSya
-/ewTbMV0Nd9rQRJ3YaNEFWKX0ekAKjL+6wcz1g==
-</ds:SignatureValue>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIEVzCCAz+gAwIBAgIJAO6gban14PLxMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNVBAYTAkdCMUMw
-QQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5k
-IFJlc2VhcmNoMSYwJAYDVQQDEx1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcjAeFw0wNjEx
-MTcxNTMwMjNaFw0wODExMTYxNTMwMjNaMHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKEzpVSyBBY2Nl
-c3MgTWFuYWdlbWVudCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYD
-VQQDEx1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOqtfMvCmBuQudC4/jZFPYkHDNHFyp1FA3KJihIUXppFvrecrO2wG5CpyqB1mZ+M
-lKf4jKcTMGBIXC2klD+FyrEdJMBhO6vRmJnNphg3uNZMks0NqIaZmtgc7e8435nMhqLHV95UK2oC
-LcT4gZrTaXa2vt9kukTOijB0KqDIfEG5369EHXPItApAEeMlHebbWndl5n2I16nya/LeaoiU9qJ6
-sVz4xd1UtUesewrmYVKgPA2JYEpovmnr13sTnGssai5Db/FkrE2NJ4Q4drbPYcwincUo/UXzrtuP
-clr+l3JEgjtvDzPrBxxvK0S/gARrbKz5tk4LDLkYsj4PKlwVS+UCAwEAAaOB3zCB3DAdBgNVHQ4E
-FgQUT0eEG4zGvMFg6PUqP/eC3MCC1QQwgawGA1UdIwSBpDCBoYAUT0eEG4zGvMFg6PUqP/eC3MCC
-1QShfqR8MHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRl
-cmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQDEx1VSyBGZWRlcmF0aW9u
-IE1ldGFkYXRhIFNpZ25lcoIJAO6gban14PLxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBAIjtHPC8Za+TQM7Ol3PB+ovNYu6gTxW+ju1hxwJc+kwiI2NveWiHLDS/daVCT2wapn2h11bA
-tgV5rnG6rSe6FlUaPukVMyjfq9Cjma3PI0d5uHPYUE83r8DHL1y6YsUDiCoiretAGVT8po4OLFmf
-/4tqZFa14H1zCa17TNwU6Va/94Iqdb28vo0q9nhBYPBb+67nzorxznGVwvDT/CX1dGTVY7do3oSH
-7vtv3wgQNwUxoGEp2pRd0z60CGdrqN2zxx5PGiN2VP2PdVbRCRpedBOMMXQl0vkWFYth3PkGKh1y
-t8APVPKHkdgr/kajkdxm5jMvi+FwcWnelTmKJuVr2BM=
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo></ds:Signature>
-
-	<Extensions>
-
-		<shibmeta:KeyAuthority xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" VerifyDepth="3">
-            <!--
-		          Authorities accepted for the federation.
-		          
-		          The KeyAuthority element's VerifyDepth attribute must be at least as
-		          large as the verification depth required by each root certificate below.
-            -->
-              
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					SDSS project internal CA
-					
-					* CN=SDSS CA, O=JISC Core Middleware Programme, C=GB
-					
-						This is used to sign individual certificates directly with no intermediates.
-						
-					No intermediates, so requires a verification depth of at least 1.
-
-					Validity
-						Not Before: Aug 24 13:34:50 2004 GMT
-						Not After : Dec 31 13:34:50 2008 GMT
-					
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIICvDCCAiWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQGEwJHQjEn
-MCUGA1UEChMeSklTQyBDb3JlIE1pZGRsZXdhcmUgUHJvZ3JhbW1lMRAwDgYDVQQD
-EwdTRFNTIENBMB4XDTA0MDgyNDEzMzQ1MFoXDTA4MTIzMTEzMzQ1MFowSDELMAkG
-A1UEBhMCR0IxJzAlBgNVBAoTHkpJU0MgQ29yZSBNaWRkbGV3YXJlIFByb2dyYW1t
-ZTEQMA4GA1UEAxMHU0RTUyBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-nG0nCHnged5EI4vKLU5ate5WzjJd39Zv7PZLuJIBN8M7RM3AfOqhXfcF1xGYs5oM
-GRytf672Fo3UffTn0wjOPRv+ZpK5YMjc1i1I44lWY/zHS3smT5gl7ZinRqyjBhTZ
-1WB0rHIiVJtBU10BmC/Gu96xV4331/CIAyoVbQNIn+cCAwEAAaOBtTCBsjAdBgNV
-HQ4EFgQUvq0gh0kHZ3Eez9e6q0CKdxYdK8AwcAYDVR0jBGkwZ4AUvq0gh0kHZ3Ee
-z9e6q0CKdxYdK8ChTKRKMEgxCzAJBgNVBAYTAkdCMScwJQYDVQQKEx5KSVNDIENv
-cmUgTWlkZGxld2FyZSBQcm9ncmFtbWUxEDAOBgNVBAMTB1NEU1MgQ0GCAQAwDwYD
-VR0TBAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADgYEA
-aImnqqpFtvuPayuSPSoH4gTaW0t3GOnN2stnRPrcP0FzfmQOA1BruKA4JsrRhBOs
-KyAs/351HF4hkBivFp2BXb4qQDP45l9YUJwTSfZT4oBLem5UWIZ/gzgYISz6G5eH
-0SOjzJxojpTWKe0eLkp9qUAdTgFKerXB9p+V84Uzgng=
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-				
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					RSA Secure Server CA (issuer for some VeriSign certs)
-					
-					* OU=Secure Server Certification Authority, O=RSA Data Security, Inc., C=US
-
-						This is used to sign individual certificates directly with no intermediates.
-						
-					No intermediates, so requires a verification depth of at least 1.
-
-					Validity
-						Not Before: Nov  9 00:00:00 1994 GMT
-						Not After : Jan  7 23:59:59 2010 GMT
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
-VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0
-MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV
-BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy
-dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ
-ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII
-0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI
-uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI
-hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3
-YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc
-1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-				
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					VeriSign Class 3 Public Primary CA
-					
-					* OU=Class 3 Public Primary Certification Authority, O=VeriSign, Inc., C=US
-
-						This is used to sign:
-
-						* CN=VeriSign Class 3 Secure Server CA, OU=VeriSign Trust Network,
-						  OU=Terms of use at https://www.verisign.com/rpa (c)05,
-						  O=VeriSign, Inc., C=US
-
-							This in turn is used to sign VeriSign Secure Site end certificates.
-						
-					One intermediate CA below the root, so requires a verification depth of at least 2.
-
-					Validity
-						Not Before: Jan 29 00:00:00 1996 GMT
-						Not After : Aug  1 23:59:59 2028 GMT
-
-					There are various versions ("generations") of the VeriSign Class3
-					Public Primary CA certificate.  The others are also included in this file.
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					VeriSign Class 3 Public Primary CA - G2
-					
-					* OU=Class 3 Public Primary Certification Authority - G2,
-					  OU=(c) 1998 VeriSign, Inc. - For authorized use only,
-					  OU=VeriSign Trust Network, O=VeriSign, Inc., C=US
-
-					Validity
-						Not Before: May 18 00:00:00 1998 GMT
-						Not After : Aug  1 23:59:59 2028 GMT
-
-					There are various versions ("generations") of the VeriSign Class3
-					Public Primary CA certificate.  The others are also included in this file.
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
-c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
-MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
-emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
-DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
-YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
-MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
-pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
-13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
-AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
-U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
-F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
-oJ2daZH9
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					VeriSign Class 3 Public Primary CA - G3
-					
-					* CN=VeriSign Class 3 Public Primary Certification Authority - G3,
-					  OU=(c) 1999 VeriSign, Inc. - For authorized use only,
-					  OU=VeriSign Trust Network, O=VeriSign, Inc., C=US
-
-					Validity
-						Not Before: Oct  1 00:00:00 1999 GMT
-						Not After : Jul 16 23:59:59 2036 GMT
-
-					There are various versions ("generations") of the VeriSign Class3
-					Public Primary CA certificate.  The others are also included in this file.
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
-N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
-KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
-kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
-CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
-Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
-imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
-2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
-DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
-F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
-TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					VeriSign Class 3 Secure Server CA
-					
-					* CN=VeriSign Class 3 Secure Server CA, OU=VeriSign Trust Network,
-					  OU=Terms of use at https://www.verisign.com/rpa (c)05, O=VeriSign, Inc., C=US
-
-						This is used to sign VeriSign Secure Site end certificates
-						(IIS certs from May 2005, other platforms from Sep/Oct 2006).
-
-					This is an intermediate CA, signed by:
-
-						* OU=Class 3 Public Primary Certification Authority, O=VeriSign, Inc., C=US
-
-					No intermediate certificates below this, so only requires a
-					verification depth of at least 1.
-
-					Validity
-						Not Before: Jan 19 00:00:00 2005 GMT
-						Not After : Jan 18 23:59:59 2015 GMT					
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIIEnDCCBAWgAwIBAgIQdTN9mrDhIzuuLX3kRpFi1DANBgkqhkiG9w0BAQUFADBf
-MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT
-LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMDUwMTE5MDAwMDAwWhcNMTUwMTE4MjM1OTU5WjCBsDELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cu
-dmVyaXNpZ24uY29tL3JwYSAoYykwNTEqMCgGA1UEAxMhVmVyaVNpZ24gQ2xhc3Mg
-MyBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAlcMhEo5AxQ0BX3ZeZpTZcyxYGSK4yfx6OZAqd3J8HT732FXjr0LLhzAC3Fus
-cOa4RLQrNeuT0hcFfstG1lxToDJRnXRkWPkMmgDqXkRJZHL0zRDihQr5NO6ziGap
-paRa0A6Yf1gNK1K7hql+LvqySHyN2y1fAXWijQY7i7RhB8m+Ipn4G9G1V2YETTX0
-kXGWtZkIJZuXyDrzILHdnpgMSmO3ps6wAc74k2rzDG6fsemEe4GYQeaB3D0s57Rr
-4578CBbXs9W5ZhKZfG1xyE2+xw/j+zet1XWHIWuG0EQUWlR5OZZpVsm5Mc2JYVjh
-2XYFBa33uQKvp/1HkaIiNFox0QIDAQABo4IBgTCCAX0wEgYDVR0TAQH/BAgwBgEB
-/wIBADBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYBBQUHAgEWHGh0
-dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwMQYDVR0fBCowKDAmoCSgIoYgaHR0
-cDovL2NybC52ZXJpc2lnbi5jb20vcGNhMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBEG
-CWCGSAGG+EIBAQQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgGA1UEAxMRQ2xhc3Mz
-Q0EyMDQ4LTEtNDUwHQYDVR0OBBYEFG/sr6DdiqTv9SoQZy0/VYK81+8lMIGABgNV
-HSMEeTB3oWOkYTBfMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIElu
-Yy4xNzA1BgNVBAsTLkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHmCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQEFBQADgYEA
-w34IRl2RNs9n3Nenr6+4IsOLBHTTsWC85v63RBKBWzFzFGNWxnIu0RoDQ1w4ClBK
-Tc3athmo9JkNr+P32PF1KGX2av6b9L1S2T/L2hbLpZ4ujmZSeD0m+v6UNohKlV4q
-TBnvbvqCPy0D79YoszcYz0KyNCFkR9MgazpM3OYDkAw=
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					Old UK e-Science CA,
-					superseded by new CA chain below but still accepted until expiry in 2007.
-					
-					* CN=CA, OU=Authority, O=eScience, C=UK
-					
-						This was used to sign individual e-Science certificates issued prior
-						to 4 August 2006.  These certificates were signed directly, with no
-						intermediates.
-						
-					No intermediates, so requires a verification depth of at least 1.
-
-					Validity
-						Not Before: Aug  5 10:36:41 2002 GMT
-						Not After : Aug  4 10:36:41 2007 GMT					
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIIE6DCCA9CgAwIBAgIBADANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJVSzER
-MA8GA1UEChMIZVNjaWVuY2UxEjAQBgNVBAsTCUF1dGhvcml0eTELMAkGA1UEAxMC
-Q0ExLTArBgkqhkiG9w0BCQEWHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9ydC5hYy51
-azAeFw0wMjA4MDUxMDM2NDFaFw0wNzA4MDQxMDM2NDFaMHAxCzAJBgNVBAYTAlVL
-MREwDwYDVQQKEwhlU2NpZW5jZTESMBAGA1UECxMJQXV0aG9yaXR5MQswCQYDVQQD
-EwJDQTEtMCsGCSqGSIb3DQEJARYeY2Etb3BlcmF0b3JAZ3JpZC1zdXBwb3J0LmFj
-LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA56AlHv32NSf4XT7Y
-BM5TsQDAT9lsHeAzLKWNtql1N/BpmvExMQtdRCs+mwSRKhakgLzWmNBVYpMzpL0M
-G6YPwedRd4JAUx4ZLhNl3iaBNtJX/J+8Tn8MIZX/1uKChKmDVUGKH+J7kggs0L7K
-k1LQN+VtYUCWSvBy2V8DTZOvjH61jSG15FXoTyaNIjGyEwhj07K4lU4MAhotvrky
-EtpVBJGxS+eqNTikx17pjdN0GIbw+4rENqpiUuYyNelZx2XKJlEG6f0fD5982FB7
-PoAT4HdMpx3tis6zTBxgNbqjG66oznZCSeRQ/CYPGOLeSGt/ry2uWoGUoE/ECQN7
-BzE/oQIDAQABo4IBizCCAYcwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUAjir
-EaOWgIsN0xUrCKWOMNqy2qgwgZoGA1UdIwSBkjCBj4AUAjirEaOWgIsN0xUrCKWO
-MNqy2qihdKRyMHAxCzAJBgNVBAYTAlVLMREwDwYDVQQKEwhlU2NpZW5jZTESMBAG
-A1UECxMJQXV0aG9yaXR5MQswCQYDVQQDEwJDQTEtMCsGCSqGSIb3DQEJARYeY2Et
-b3BlcmF0b3JAZ3JpZC1zdXBwb3J0LmFjLnVrggEAMA4GA1UdDwEB/wQEAwIBBjAR
-BglghkgBhvhCAQEEBAMCAQYwKQYDVR0RBCIwIIEeY2Etb3BlcmF0b3JAZ3JpZC1z
-dXBwb3J0LmFjLnVrMCkGA1UdEgQiMCCBHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9y
-dC5hYy51azA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY2EuZ3JpZC1zdXBwb3J0
-LmFjLnVrL2NnaS1iaW4vaW1wb3J0Q1JMMA0GCSqGSIb3DQEBBQUAA4IBAQBpQBNC
-EH4W/cFm1M2MIVbDepb2+gRpqtvhi/4GSAIvmdEh2eM0B5ai+meoPH/ROxA5aQK/
-QMpx8lLwUrJDmDUm142g4TDnTPPZsMUdQqJ2JaaT+15Bx3jyWvpctYAqyGnnjoQC
-tnRujQakEIZPKfNAUnjY6k+UQAvTJLaM+0uuXh1eUU5lvvq2XCCXYFAIzLjL9rtC
-3S36fulEZTrOOVPj/bYNoG9jjt9wVvkfroQMoqrJe4n5d5WoTsEY6emf9a7Nfrx5
-Pz2XTOPPwwlPkClBwaCZvDZ1FhZhaF4+IXFqLNwlJ3xDDS/tU4MH7YQlLsKmHnAC
-AgqhcJOAgRcQdi76
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-				
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					UK e-Science Root CA
-					
-					* CN=CA, L=Root, OU=Authority, O=eScienceRoot, C=UK
-					
-						This is used to sign:
-
-						* CN=CA, OU=Authority, O=eScienceCA, C=UK
-
-							This in turn is used to sign e-Science end certificates.
-						
-					One intermediate CA below the root, so requires a verification depth of at least 2.
-
-					Validity
-						Not Before: Jul 14 16:30:27 2006 GMT
-						Not After : Jul 14 16:30:27 2026 GMT					
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIID5TCCAs2gAwIBAgIBADANBgkqhkiG9w0BAQUFADBUMQswCQYDVQQGEwJVSzEV
-MBMGA1UEChMMZVNjaWVuY2VSb290MRIwEAYDVQQLEwlBdXRob3JpdHkxDTALBgNV
-BAcTBFJvb3QxCzAJBgNVBAMTAkNBMB4XDTA2MDcxNDE2MzAyN1oXDTI2MDcxNDE2
-MzAyN1owVDELMAkGA1UEBhMCVUsxFTATBgNVBAoTDGVTY2llbmNlUm9vdDESMBAG
-A1UECxMJQXV0aG9yaXR5MQ0wCwYDVQQHEwRSb290MQswCQYDVQQDEwJDQTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/TfukTbIrOJ116B8oFqVlGeNNX
-bwIX2NVkCF8blpMobk7kHnUcsyA7wW4bW70e4MfL4jF+U80bEgioIEivJaN2udSA
-jEmM7yiHelbW5MvS2FiH8rY72ahZMfu6Mc15RD27Lr4WphXUKGazd3XDcyGOZukh
-uEksjSKMcPZ+UX4TBlI/a20YCcPD5K61Jh8tF0W+yiDjjXPDwNK31YtIKekbNntf
-w2VZtX1SHLl9xtVoj3JUvO4B4sG2QdYPAPW6EvMEFdQ3wNbA0ySNfD42lLExWYSD
-sJI8qwKHBict/KAUdyBeKdjiA+A0fawFkD1wevF1chPkPqMEHD2uajC2kzECAwEA
-AaOBwTCBvjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
-FgQUcXcuwiKiOKOwp8hMHZcqlYnagqMwfAYDVR0jBHUwc4AUcXcuwiKiOKOwp8hM
-HZcqlYnagqOhWKRWMFQxCzAJBgNVBAYTAlVLMRUwEwYDVQQKEwxlU2NpZW5jZVJv
-b3QxEjAQBgNVBAsTCUF1dGhvcml0eTENMAsGA1UEBxMEUm9vdDELMAkGA1UEAxMC
-Q0GCAQAwDQYJKoZIhvcNAQEFBQADggEBAKP+MU3IrDKBWNY1ujegVe/RFq0ONduh
-ZXc13xD+tN2/1I2qLydv3hccRdbZ6fB6Cw1A/vC9XxwSgp2qc5Hzx1UVNFyN7oFc
-SzJmSC/i9FAHIeScZHLwm5CpwiXslkWwHJ01MN50Pj/C2KLee3DlUdvAUpb5Kmxo
-2H41NPd0qpd4BW93bXVgytKimcCz9nNGW2M6SxNKpgtsRidiF+fVBXCcbmaD/MGK
-bHYRYc94DJpA+UbDQx6bH4iddVd4afwtXSn8oHKdbnUV6pqrSOmWr/Qk37jRDdRE
-pP+kIGJEM3oRG0UjcuRJ/E6KgoKdZLjtjV5ZBkaJf4ABWImkStD2JZo=
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-				
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					UK e-Science CA
-					
-					* CN=CA, OU=Authority, O=eScienceCA, C=UK
-					
-						This is used to sign e-Science end certificates issued from 4 August 2006.
-
-					No intermediates below this, so requires verification depth of at least 1.
-
-					This is an intermediate CA, signed by:
-
-						* CN=CA, L=Root, OU=Authority, O=eScienceRoot, C=UK
-
-					Validity
-						Not Before: Jul 14 16:32:55 2006 GMT
-						Not After : Jul 15 16:32:55 2011 GMT					
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIID1DCCArygAwIBAgIBATANBgkqhkiG9w0BAQUFADBUMQswCQYDVQQGEwJVSzEV
-MBMGA1UEChMMZVNjaWVuY2VSb290MRIwEAYDVQQLEwlBdXRob3JpdHkxDTALBgNV
-BAcTBFJvb3QxCzAJBgNVBAMTAkNBMB4XDTA2MDcxNDE2MzI1NVoXDTExMDcxNTE2
-MzI1NVowQzELMAkGA1UEBhMCVUsxEzARBgNVBAoTCmVTY2llbmNlQ0ExEjAQBgNV
-BAsTCUF1dGhvcml0eTELMAkGA1UEAxMCQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC08S40q4YSCt4sNNM9T5qB133eCLW5B0Qg0YWHgViSVc6f6f2B
-VJS4MBpOth6sdwvca7mO7C+dOnMEBwyRdFu7wtVOyRR86dbStMkKyljvOOwM6AYf
-lz52x9XnVPvTj+FN9mLD5/NmboSRv86Kw6erKJhAQQwuHVPkCOjtWorhdmpcHVci
-oA4FfVEBZGeAND5IPrOXTYH281baPBciDqfPOESNEh4xltyUrbFnhmAgYGb7IGoP
-b0sNOEOIWOivKuSHMU+dthIBZuytXzctcAtGa4yIGZluj0vs7Ak2HunA2PuXw6/c
-v2j41jBBNpil5WgxYNwt4FsFjLUvWy+gS7mPAgMBAAGjgcEwgb4wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP+lqRpuD2+U6TfRwKVG
-Haghk2pLMHwGA1UdIwR1MHOAFHF3LsIiojijsKfITB2XKpWJ2oKjoVikVjBUMQsw
-CQYDVQQGEwJVSzEVMBMGA1UEChMMZVNjaWVuY2VSb290MRIwEAYDVQQLEwlBdXRo
-b3JpdHkxDTALBgNVBAcTBFJvb3QxCzAJBgNVBAMTAkNBggEAMA0GCSqGSIb3DQEB
-BQUAA4IBAQCBuqI6gcY6/BpOTSYHb4B6ga9LBPK9zo96pVOy4IFfoMN6VS9Bo2fK
-lBCK+OOSWy5KpN1q6UOyWh8Dcf/hc2lmEBo92gFqG+4gRKBa4IrTDJBARVWXd379
-kOAl68sqUDGcciUrQJwVclTO+KsgaVYmo3BvAhqJf4gnLm6XVUgHKl9+WPqDAQdf
-DeBCGOOPd0pPMy6RUgXIE+HAgh14yyGfJkiFlYHqaeqqL7A8gxrGSABcqbcUHnH1
-kTdHshE2ulkcpqV9wwWldr8S26tIYg9ZvYO1KNNgkwgoLIcKIc22r5IvQ8c7zeI7
-8tqPk/TcVznFNfvmsrJSn2urKL4pKJrT
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-				
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					GlobalSign Root CA
-				
-					* CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE
-					
-						This is used to sign:
-						
-						* CN=GlobalSign Primary Secure Server CA, OU=Primary Secure Server CA, O=GlobalSign nv-sa, C=BE
-						
-							This is used to sign:
-							
-							* CN=GlobalSign ServerSign CA, OU=ServerSign CA, O=GlobalSign nv-sa, C=BE
-							
-								This in turn is used to sign ServerSign end certificates.					
-	
-					Two levels of intermediate certificate below the root, so requires a
-					verification depth of at least 3.
-					
-					Validity
-						Not Before: Sep  1 12:00:00 1998 GMT
-						Not After : Jan 28 12:00:00 2014 GMT
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIIDdTCCAl2gAwIBAgILAgAAAAAA1ni3lAUwDQYJKoZIhvcNAQEEBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0xNDAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIABjAdBgNVHQ4EFgQU
-YHtmGkUNl8qJUC99BM00qP/8/UswDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
-AQQFAAOCAQEArqqf/LfSyx9fOSkoGJ40yWxPbxrwZKJwSk8ThptgKJ7ogUmYfQq7
-5bCdPTbbjwVR/wkxKh/diXeeDy5slQTthsu0AD+EAk2AaioteAuubyuig0SDH81Q
-gkwkr733pbTIWg/050deSY43lv6aiAU62cDbKYfmGZZHpzqmjIs8d/5GY6dT2iHR
-rH5Jokvmw2dZL7OKDrssvamqQnw1wdh/1acxOk5jQzmvCLBhNIzTmKlDNPYPhyk7
-ncJWWJh3w/cbrPad+D6qp1RF8PX51TFl/mtYnHGzHtdS6jIX/EBgHcl5JLL2bP2o
-Zg6C3ZjL2sJETy6ge/L3ayx2EYRGinij4w==
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-	
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					GlobalSign Primary Secure Server CA
-				
-					* CN=GlobalSign Primary Secure Server CA, OU=Primary Secure Server CA, O=GlobalSign nv-sa, C=BE
-					
-						This is used to sign:
-						
-						* CN=GlobalSign ServerSign CA, OU=ServerSign CA, O=GlobalSign nv-sa, C=BE
-						
-							This in turn is used to sign ServerSign end certificates.					
-	
-					One level of intermediate certificate below this, so requires a
-					verification depth of at least 2.
-
-					This is an intermediate CA, signed by:
-				
-						* CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE
-
-					Validity
-						Not Before: Jan 28 12:00:00 1999 GMT
-						Not After : Jan 27 11:00:00 2014 GMT
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIID7zCCAtegAwIBAgILBAAAAAABCNlhHh4wDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05OTAxMjgxMjAw
-MDBaFw0xNDAxMjcxMTAwMDBaMHkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMSEwHwYDVQQLExhQcmltYXJ5IFNlY3VyZSBTZXJ2ZXIgQ0Ex
-LDAqBgNVBAMTI0dsb2JhbFNpZ24gUHJpbWFyeSBTZWN1cmUgU2VydmVyIENBMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9mrtqGswoy2s6UKeGDXAHvdv
-dMu3QiRTrTHL76XJxT0DXqWdds0Z4uEWLaQtRCDxGh/3fWDNpscVqauKoslmbN0Q
-o9ibdynupkDNLzQ2f6MXBQvLWKUipnw15o1doVPCmsXaXf7YDn07IpdSLN2yPAuQ
-3AX9suUKVR5dnmL7f+O4lvSfJqyiXITZgrrg6PWVbgQKlmRJow+eg6lj58khmWug
-FpElyBTZvdzsPHdTR1ZDhH7WY+XjKK88T8B9tBj2175XC4nb1sGDkpLjnDDRWUyl
-cZBfhgdw6E6UFMnyTqOAwloRqejo4rwCnL84TXraPFFj7rz4fFF+oLjgSKmvrQID
-AQABo4GZMIGWMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
-DgQWBBTRZoP1iV7Qvn9h0t2oyvorekp/MTAzBgNVHR8ELDAqMCigJqAkhiJodHRw
-Oi8vY3JsLmdsb2JhbHNpZ24ubmV0L1Jvb3QuY3JsMB8GA1UdIwQYMBaAFGB7ZhpF
-DZfKiVAvfQTNNKj//P1LMA0GCSqGSIb3DQEBBQUAA4IBAQCc/xTUC7yfoztsuSwh
-yDfDRU0w+0uSkOBYBb30bknZlLUJiGhuU9zOLHajg0ooxYo/RdDxLwBloK4XBzgA
-1Cjiw+JJbLcC4Sk9lNzUx9pjAU88q+HnhGFE5v4tfP/iXBm8TFnMvpq0cUgizi2b
-tH7B2ue+jWeIdmXqkSUDVuoEjiVlaFQjGZEm37JGdjFYqwr9qDXioMQlr3owBIcd
-/8B7a4AeSnd70iwU0giZBlwCjdVJo1sAFKoznEmRbCoBi+IXncx0w2oK5uuBOKX8
-J6mFIJZtXOCLMhhh+cO801XohixLfQk38vjRkXZrvPqQcLo4WiQpff/N0n41bdnu
-mvjF
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-			
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-				
-					GlobalSign ServerSign CA
-				
-					* CN=GlobalSign ServerSign CA, OU=ServerSign CA, O=GlobalSign nv-sa, C=BE
-					
-						This is used to sign ServerSign end certificates.					
-	
-					No intermediate certificates below this, so only requires a
-					verification depth of at least 1.
-
-					This is an intermediate CA, signed by:
-
-						* CN=GlobalSign Primary Secure Server CA, OU=Primary Secure Server CA, O=GlobalSign nv-sa, C=BE
-				
-					Validity
-						Not Before: Jan 22 09:00:00 2004 GMT
-						Not After : Jan 27 10:00:00 2014 GMT
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIIEFzCCAv+gAwIBAgILBAAAAAABCNlhJc8wDQYJKoZIhvcNAQEFBQAweTELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExITAfBgNVBAsTGFBy
-aW1hcnkgU2VjdXJlIFNlcnZlciBDQTEsMCoGA1UEAxMjR2xvYmFsU2lnbiBQcmlt
-YXJ5IFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMDQwMTIyMDkwMDAwWhcNMTQwMTI3MTAw
-MDAwWjBjMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEW
-MBQGA1UECxMNU2VydmVyU2lnbiBDQTEhMB8GA1UEAxMYR2xvYmFsU2lnbiBTZXJ2
-ZXJTaWduIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dkNqei/
-yW/6JO5Wc7YT0C4NnfG/7TxWnxjFjMkdi2adIiSYRJmYkKyY7VKVYAjSIdpOelaO
-cjfkWiLKYUVa+Bznik0EASFwGcWh12YgscLaFwaPINsO0EbU77Akx+ObdvXJwtIE
-CSL8sGX/bPbWKZdjJQjtkNaK/IkHvazrAxZjeuqj+IKGdFT3dabWXLKkqqx/s3C8
-TiXHW8YDXaqxteXa+CzXsTI9dPm6C9PQ5wMaZFc7bMOxi3jiA9CVt4Scb/VRWRWB
-86UxBpD5Aw0Wg9g4RrfG3vJbec5q6NU4gGINHDQJOj3ZoZmbWk6EVm22jH3sHa5I
-aW84jH70y+nX7QIDAQABo4G1MIGyMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8E
-CDAGAQH/AgEAMB0GA1UdDgQWBBRIu6i/W4TSV0jkYemRIJHYHSXffzA5BgNVHR8E
-MjAwMC6gLKAqhihodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L3ByaW1zZXJ2ZXIu
-Y3JsMBEGCWCGSAGG+EIBAQQEAwICBDAfBgNVHSMEGDAWgBTRZoP1iV7Qvn9h0t2o
-yvorekp/MTANBgkqhkiG9w0BAQUFAAOCAQEAP/iVafKvW0zupGPQ/4Kc2OqZSCLo
-lwkE0+tsZzH7q/oIL5o1HKzEA4acHOHMoxZ7PrUL24sZz+9KoGxsZaz3+pj7JSih
-/k0kFaLkJ+jcDqGz441uhRWRfP0Nv8o/GvMsGxAwZHUa3cW1ytEKHUvzgSnKqr0o
-rGbJSoAb59oezXnB6YWkel+4840tciE/DwwYfBFL7Kq6SFdSM8ioDsOfz7bsDbnt
-nk67vMUgBiiiFFoQymb++pOpIMBYV5Bvqtc5vUGla6fOL53iU4GiwPnUEMqVwpra
-HBtFP+DIpNCr0Iai5G1wY5rfdmdz9TaJPi3YtwXLdNfZAf9KfJv5q547rQ==
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-				
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<!--
-			
-					Thawte Premium Server CA
-					
-					* C=ZA, ST=Western Cape, L=Cape Town, O=Thawte Consulting cc,
-                                            OU=Certification Services Division, CN=Thawte Premium Server CA
-                                               /emailAddress=premium-server at thawte.com
-					
-						This is used to sign individual certificates directly with no intermediates.
-						
-					No intermediates, so requires a verification depth of at least 1.
-	
-					Validity
-						Not Before: Aug  1 00:00:00 1996 GMT
-						Not After : Dec 31 23:59:59 2020 GMT
-
-				-->
-				<ds:X509Data>
-					<ds:X509Certificate>MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
-dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
-MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
-A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
-b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
-cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
-VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
-ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
-uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
-hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
-pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
-</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-				
-		</shibmeta:KeyAuthority>
-	</Extensions>
-	
-	
-	
-<EntityDescriptor ID="uk000001" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:target.iay.org.uk">
-    <!--
-        target.iay.org.uk is an SDSS project test target running outside the University environment.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=target.iay.org.uk, OU=SDSS Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <!-- Note: Assertion Consumer is SSL protected, but at a non-standard port number. -->
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target.iay.org.uk:8446/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://target.iay.org.uk:8446/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS Causewayside</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS Causewayside</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000002" entityID="https://sp.ovid.com/shibboleth">
-    <!--
-        shibboleth-dev.ovid.com is an Ovid Service Provider.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibboleth-dev.ovid.com</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Ovid</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Ovid</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ovid.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Bridget</GivenName>
-        <SurName>Almas</SurName>
-        <EmailAddress>mailto:balmas at ovid.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Bridget</GivenName>
-        <SurName>Almas</SurName>
-        <EmailAddress>mailto:balmas at ovid.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Bridget</GivenName>
-        <SurName>Almas</SurName>
-        <EmailAddress>mailto:balmas at ovid.com</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000003" entityID="urn:mace:eduserv.org.uk:athens:federation:beta">
-    <!--
-        This is a beta Athens/Shibboleth gateway. The entity is a combined IdP and SP.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">athensams.net</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        <wayf:HideFromWAYF xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF">
-            <!-- omit this entity from the SDSS Federation WAYF -->				
-        </wayf:HideFromWAYF>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">athensams.net</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gateway.athensams.net</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://beta.athensams.net"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">athensams.net</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gateway.athensams.net</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor> 
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gateway.athensams.net</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.athensams.net/saml/AfctRcv" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.athensams.net/saml/PostRcv" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Athens Gateway Beta</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Athens Gateway Beta</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.athensams.net/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Tom</GivenName>
-        <SurName>Demeranville</SurName>
-        <EmailAddress>mailto:tnd at eduserv.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000004" entityID="https://typekey.sdss.ac.uk/shibboleth">
-    <!--
-        typekey.sdss.ac.uk is an SDSS project site running a
-        TypeKey to Shibboleth bridge.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">typekey.sdss.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">typekey.sdss.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>typekey.sdss.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://typekey.sdss.ac.uk:8443/typekey/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://typekey.sdss.ac.uk/typekey/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">typekey.sdss.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>typekey.sdss.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://typekey.sdss.ac.uk:8443/typekey/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS TypeKey Bridge</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS TypeKey Bridge</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>SDSS Support List</GivenName>
-        <EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Alan</GivenName>
-        <SurName>Ferguson</SurName>
-        <EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000005" entityID="https://typekey.iay.org.uk/shibboleth">
-    <!--
-        typekey.iay.org.uk is an SDSS project site running outside the University environment
-        This variation is an experimental TypeKey to Shibboleth bridge.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">typekey.iay.org.uk</shibmeta:Scope>
-        <wayf:HideFromWAYF xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF">
-            <!-- omit this entity from the SDSS Federation WAYF -->				
-        </wayf:HideFromWAYF>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">typekey.iay.org.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>typekey.iay.org.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://typekey.iay.org.uk:8451/typekey/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://typekey.iay.org.uk:8450/typekey/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">typekey.iay.org.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>typekey.iay.org.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://typekey.iay.org.uk:8451/typekey/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS Causewayside (TypeKey)</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS Causewayside (TypeKey)</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000006" entityID="https://shtestsp1.cs.iay.org.uk/shibboleth">
-    <!--
-        shtestsp1.cs.iay.org.uk is an SDSS project test target running outside the University environment.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=shtestsp1.cs.iay.org.uk, OU=SDSS Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <!-- Note: Assertion Consumer is SSL protected, but at a non-standard port number. -->
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shtestsp1.cs.iay.org.uk:7443/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shtestsp1.cs.iay.org.uk:7443/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS Causewayside Test SP 1</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS Causewayside Test SP 1</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000007" entityID="https://shtestsp2.cs.iay.org.uk/shibboleth">
-    <!--
-        shtestsp2.cs.iay.org.uk is an SDSS project test target running outside the University environment.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=shtestsp2.cs.iay.org.uk, OU=SDSS Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <!-- Note: Assertion Consumer is SSL protected, but at a non-standard port number. -->
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shtestsp2.cs.iay.org.uk:9443/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shtestsp2.cs.iay.org.uk:9443/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS Causewayside Test SP 2</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS Causewayside Test SP 2</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000008" entityID="https://shibidp.ntu.ac.uk/shibboleth">
-    <!--
-        Identity Provider for Nottingham Trent University
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibidp.ntu.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.ntu.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibidp.ntu.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.ntu.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Nottingham Trent University</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Nottingham Trent University</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ntu.ac.uk</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>ITS Shibboleth</GivenName>
-        <EmailAddress>mailto:shibboleth at ntu.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Francis</GivenName>
-        <SurName>Lowry</SurName>
-        <EmailAddress>mailto:francis.lowry at ntu.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Julie</GivenName>
-        <SurName>Redford</SurName>
-        <EmailAddress>mailto:julie.redford at ntu.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000009" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:gilead.ncl.ac.uk">
-    <!--
-        gilead.ncl.ac.uk is the IAMSECT project's target for a beta test of metalib library software
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=gilead.ncl.ac.uk, OU=SAPIR Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <!--
-            NOTE: this AssertionConsumerService is not SSL-protected.
-        -->
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://gilead.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://gilead.ncl.ac.uk:8331/Shibboleth.sso/SAML/POST" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Newcastle Library Metalib test</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Newcastle Library Metalib test</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>John Williams</GivenName>
-        <EmailAddress>mailto:John.Williams at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000010" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:shib.ncl.ac.uk">
-    <!--
-        shib.ncl.ac.uk is an identity provider for the IAMSECT project
-        and the production IdP for the University of Newcastle
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shib.ncl.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ncl.ac.uk/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shib.ncl.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ncl.ac.uk:8443/shibboleth/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Newcastle</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet Wheeler</GivenName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000011" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:cocoon.ncl.ac.uk">
-    <!--
-        cocoon.ncl.ac.uk is a target for the University of Newcastle upon Tyne and the IAMSECT project
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=cocoon.ncl.ac.uk, OU=Computing Service, O=University of Newcastle upon Tyne, L=Newcastle upon Tyne, ST=England, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cocoon.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">IAMSECT</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">IAMSECT</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet Wheeler</GivenName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000012" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:dangermouse.ncl.ac.uk">
-    <!--
-        dangermouse.ncl.ac.uk is an IAMSECT IIS test target
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=dangermouse.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dangermouse.ncl.ac.uk/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">IAMSECT IIS test</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">IAMSECT IIS test</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet Wheeler</GivenName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000013" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:lists.ncl.ac.uk">
-    <!--
-        lists.ncl.ac.uk is the University of Newcastle upon Tyne's target for a Sympa based list server.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=lists.ncl.ac.uk, OU=Computing Service, O=University of Newcastle upon Tyne, L=Newcastle upon Tyne, ST=England, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">lists</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">lists</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Gavin Younger</GivenName>
-        <EmailAddress>mailto:gavin.younger at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000014" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:mclined-online.ncl.ac.uk">
-    <!--
-        mclined-online.ncl.ac.uk is the IAMSECT project's target for a live deployment of a zope based virtual learning environment
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=mclined-online.ncl.ac.uk, OU=Faculty of Medical Sciences Computing, O=University of Newcastle upon Tyne, L=Newcastle upon Tyne, ST=England, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mclined-online.ncl.ac.uk/Shibboleth.shire" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mclined-online.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">mclined-online</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">mclined-online</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Tony McDonald</GivenName>
-        <EmailAddress>mailto:tony.mcdonald at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000015" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:play.ncl.ac.uk">
-    <!--
-        play.ncl.ac.uk is the IAMSECT project's test target
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=play.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.ncl.ac.uk/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">IAMSECT</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">IAMSECT</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet Wheeler</GivenName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000016" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:tea.ncl.ac.uk">
-    <!--
-        tea.ncl.ac.uk is an IAMSECT project test target
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=tea.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tea.ncl.ac.uk/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">IAMSECT ZOPE TEST</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">IAMSECT ZOPE TEST</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet Wheeler</GivenName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000017" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:webdev2.ncl.ac.uk">
-    <!--
-        webdev2.ncl.ac.uk is an IAMSECT project test target
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=webdev2.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webdev2.ncl.ac.uk/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">IAMSECT JON TEST</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">IAMSECT JON TEST</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet Wheeler</GivenName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000018" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:webdev3.ncl.ac.uk">
-    <!--
-        webdev3.ncl.ac.uk is an IAMSECT project test target
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=webdev3.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webdev3.ncl.ac.uk/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">IAMSECT CAL TEST</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">IAMSECT CAL TEST</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb Racey</GivenName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet Wheeler</GivenName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000019" entityID="urn:mace:inqueue:slioch.ucs.ed.ac.uk">
-    <!--
-        SDSS slioch-test is another test identity provider for the SDSS project
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">slioch.ucs.ed.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">slioch.ucs.ed.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>slioch.ucs.ed.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://slioch.ucs.ed.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">slioch.ucs.ed.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>slioch.ucs.ed.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slioch.ucs.ed.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS slioch-test</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS slioch-test</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>John Murison</GivenName>
-        <EmailAddress>mailto:J.Murison at ed.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>John Murison</GivenName>
-        <EmailAddress>mailto:J.Murison at ed.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000020" entityID="https://coursework.cs.ncl.ac.uk/shibboleth/metadata">
-    <!--
-        coursework.ncl.ac.uk is an SP for the University of Newcastle upon Tyne.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=coursework.cs.ncl.ac.uk, O=University of Newcastle upon Tyne, L=Newcastle upon Tyne, ST=England, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://coursework.cs.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Newcastle</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Lindsay</GivenName>
-        <SurName>Marshall</SurName>
-        <EmailAddress>mailto:Lindsay.Marshall at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Caleb</GivenName>
-        <SurName>Racey</SurName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000021" entityID="https://www.educationcity.com/sso/shib">
-    <!--
-        www.educationcity.com is an SP for EducationCity, an organisation offering educational services to schoolchildren.
-        They are known to I2Q.
-        EducationCity are using their own SP implementation, which allows the two AssertionConsumerService
-        elements below to have the same Location value.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=www.educationcity.com, OU=IT, O=EducationCity Ltd, L=Melton Mowbray, S=Leicestershire, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://web1.educationcity.com/sso/shib/acs1/" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://web1.educationcity.com/sso/shib/acs1/" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">EducationCity</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">EducationCity</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.educationcity.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Tom</GivenName>
-        <SurName>Morgan</SurName>
-        <EmailAddress>mailto:tom at educationcity.com</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000022" entityID="https://shibgrid-test.oerc.ox.ac.uk/shibboleth-idp">
-    <!--
-        oerc.ox.ac.uk is an Identity Provider for the Oxford e-Research Centre, specifically for the ShibGrid project.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shibgrid.oerc.ox.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shibgrid.oerc.ox.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>ktang.oerc.ox.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ktang.oerc.ox.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shibgrid.oerc.ox.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>ktang.oerc.ox.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ktang.oerc.ox.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">OeRC Test</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">OeRC Test</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/activities/projects/index.xml?ID=ShibGrid</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Kang</GivenName>
-        <SurName>Tang</SurName>
-        <EmailAddress>mailto:kang.tang at oerc.ox.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Kang</GivenName>
-        <SurName>Tang</SurName>
-        <EmailAddress>mailto:kang.tang at oerc.ox.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000023" entityID="https://ktang.oerc.ox.ac.uk/shibboleth">
-    <!--
-        This SP is used by the ShibGrid Project for test purposes in Oxford e-Research Centre(OeRC).
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <!--
-            Note non-standard setup: the WantAssertionsSigned attribute is set to true for this SP
-            by specific request.
-        -->
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>emailAddress=kang.tang at oerc.ox.ac.uk, CN=host/ktang.oerc.ox.ac.uk, L=OeSC, OU=Oxford, O=eScience, C=UK</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ktang.oerc.ox.ac.uk:8080/Shibboleth.sso/SAML/POST" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">OeRC Test SP</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">OeRC Test SP</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/activities/projects/index.xml?ID=ShibGrid</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Kang</GivenName>
-        <SurName>Tang</SurName>
-        <EmailAddress>mailto:kang.tang at oerc.ox.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Kang</GivenName>
-        <SurName>Tang</SurName>
-        <EmailAddress>mailto:kang.tang at oerc.ox.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000024" entityID="https://moleman.warwick.ac.uk/origin">
-    <!--
-        moleman.warwick.ac.uk is a test IdP for University of Warwick IT Services
-        Note that the software in use is AthensIM, modified by Warwick staff.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">moleman.warwick.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">moleman.warwick.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>moleman.warwick.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://moleman.warwick.ac.uk/origin/hs"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">moleman.warwick.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>moleman.warwick.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://moleman.warwick.ac.uk/origin/aa"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Warwick - SDSS Test</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Warwick - SDSS Test</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.warwick.ac.uk</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Kieran Shaw</GivenName>
-        <EmailAddress>mailto:kieran.shaw at warwick.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Kieran Shaw</GivenName>
-        <EmailAddress>mailto:kieran.shaw at warwick.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000025" entityID="https://shibdev.ltscotland.com/shibboleth">
-    <!--
-        shibdev.ltscotland.com is a service provider for the Learning and Teaching Scotland SSDN Integration Project.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=shibdev.ltscotland.com, OU=LT Scotland SSDN Integration Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibdev.ltscotland.com/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibdev.ltscotland.com/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">LTS SSDN</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">LTS SSDN</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ltscotland.org.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Mike</GivenName>
-        <SurName>Thomas</SurName>
-        <EmailAddress>mailto:m.thomas at ltscotland.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Mike</GivenName>
-        <SurName>Thomas</SurName>
-        <EmailAddress>mailto:m.thomas at ltscotland.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Mike</GivenName>
-        <SurName>Thomas</SurName>
-        <EmailAddress>mailto:m.thomas at ltscotland.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000026" entityID="urn:mace:eduserv.org.uk:athens:provider:tvu.ac.uk">
-    <!--
-        urn:mace:eduserv.org.uk:athens:provider:tvu.ac.uk is an IdP for Thames Valley University.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibboleth1.tvu.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.tvu.ac.uk/shibboleth-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth1.tvu.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">tvu.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibboleth1.tvu.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.tvu.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Thames Valley University</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Thames Valley University</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.tvu.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Tariq</GivenName>
-        <SurName>Khan</SurName>
-        <EmailAddress>mailto:tariq.khan at tvu.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Xiao</GivenName>
-        <SurName>Xu</SurName>
-        <EmailAddress>mailto:xiaoyan.xu at tvu.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000027" entityID="https://idp.mo.lsc.gov.uk/shibboleth">
-    <!--
-        https://idp.mo.lsc.gov.uk/shibboleth is a Learning Skills Council (LSC) Identity Provider to support 
-        'short term project group' pilot work on use of Shibboleth.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">mo.lsc.gov.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">mo.lsc.gov.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>mo.lsc.gov.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mo.lsc.gov.uk/shibboleth-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mo.lsc.gov.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">mo.lsc.gov.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>mo.lsc.gov.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mo.lsc.gov.uk:9443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">LSC Members Identity Service (Pilot)</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">LSC Members Identity Service (Pilot)</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.lsc.gov.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Julian</GivenName>
-        <SurName>Baden</SurName>
-        <EmailAddress>mailto:julian.baden at xansa.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Nick</GivenName>
-        <SurName>Hill</SurName>
-        <EmailAddress>mailto:nick.hill at xansa.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Jason</GivenName>
-        <SurName>Bryant</SurName>
-        <EmailAddress>mailto:jason.bryant at lsc.gov.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000028" entityID="https://sso-test.esc.rl.ac.uk/shibboleth-sp">
-     <!--
-        This ShibGrid SP is for downloading automatically-generated credentials. It does not include
-        the actual portal, which will use Grid credentials generated from the user's attributes.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <!--
-            Note non-standard setup: the WantAssertionsSigned attribute is set to true for this SP
-            by specific request.
-        -->
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>emailAddress=support at grid-support.ac.uk, CN=sso-test.esc.rl.ac.uk, L=RAL, OU=CLRC, O=eScience, C=UK</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-test.esc.rl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-test.esc.rl.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">ShibGrid (MyProxy & Tools)</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">ShibGrid (MyProxy & Tools)</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/index.cfm?name=proj_shibgrid</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>David</GivenName>
-        <SurName>Spence</SurName>
-        <EmailAddress>mailto:d.r.spence at rl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000029" entityID="urn:mace:eduserv.org.uk:athens:provider:liv.ac.uk">
-    <!--
-        urn:mace:eduserv.org.uk:athens:provider:liv.ac.uk is an Identity Provider for the University of Liverpool.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibboleth.liv.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.liv.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibboleth.liv.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.liv.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">University of Liverpool</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">University of Liverpool</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.liv.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Pete</GivenName>
-        <SurName>Mallinson</SurName>
-        <EmailAddress>mailto:webmaster at liv.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000030" entityID="https://sso-test.esc.rl.ac.uk/shibboleth">
-    <!--
-        sso-test.esc.rl.ac.uk is project-specific, for users involved in ShibGrid
-        and possibly other projects investigating Shibboleth in CCLRC & Diamond. 
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sso-test.esc.rl.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sso-test.esc.rl.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>sso-test.esc.rl.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso-test.esc.rl.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sso-test.esc.rl.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>sso-test.esc.rl.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso-test.esc.rl.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">ShibGrid (CCLRC & Diamond Test Users)</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">ShibGrid (CCLRC & Diamond Test Users)</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/index.cfm?name=proj_shibgrid</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>David</GivenName>
-        <SurName>Spence</SurName>
-        <EmailAddress>mailto:d.r.spence at rl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000031" entityID="https://shib.salfordsoftware.co.uk/shibboleth">
-    <!--
-        https://shib.salfordsoftware.co.uk/shibboleth is an Identity Provider for Salford Software.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shib.salfordsoftware.co.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shib.salfordsoftware.co.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shib.salfordsoftware.co.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.salfordsoftware.co.uk/shibboleth-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.salfordsoftware.co.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shib.salfordsoftware.co.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shib.salfordsoftware.co.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.salfordsoftware.co.uk/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Salford Software</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Salford Software</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.salfordsoftware.co.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Matt</GivenName>
-        <SurName>Dunkin</SurName>
-        <EmailAddress>mailto:matt.dunkin at salfordsoftware.co.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Matt</GivenName>
-        <SurName>Dunkin</SurName>
-        <EmailAddress>mailto:matt.dunkin at salfordsoftware.co.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Matt</GivenName>
-        <SurName>Dunkin</SurName>
-        <EmailAddress>mailto:matt.dunkin at salfordsoftware.co.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000032" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:gabriel.lse.ac.uk">
-    <!--
-        gabriel.lse.ac.uk is a Perseus Project SP (an LSE Projects WIKI)
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gabriel.lse.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gabriel.lse.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">LSE Projects WIKI</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">LSE Projects WIKI</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Simon McLeish</GivenName>
-        <EmailAddress>mailto:s.mcleish at lse.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Simon McLeish</GivenName>
-        <EmailAddress>mailto:s.mcleish at lse.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000033" entityID="https://idp.atomwide.com/shibboleth">
-    <!--
-        https://idp.atomwide.com/shibboleth is an Identity Provider for Atomwide Limited.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">uso.atomwide.com</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">uso.atomwide.com</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp.atomwide.com</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.atomwide.com/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">uso.atomwide.com</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp.atomwide.com</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.atomwide.com:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Atomwide USO</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Atomwide USO</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.atomwide.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Atomwide Shibboleth Support</GivenName>
-        <EmailAddress>mailto:shibboleth at atomwide.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Phil</GivenName>
-        <SurName>Chapman</SurName>
-        <EmailAddress>mailto:phil at atomwide.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Phil</GivenName>
-        <SurName>Chapman</SurName>
-        <EmailAddress>mailto:phil at atomwide.com</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000034" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:sdss.ac.uk">
-    <!--
-        sdss.ac.uk is the identity provider for the SDSS project itself.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sdss.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sdss.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>origin.sdss.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.sdss.ac.uk/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sdss.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>origin.sdss.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.sdss.ac.uk/shibboleth/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>SDSS Support List</GivenName>
-        <EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Alan</GivenName>
-        <SurName>Ferguson</SurName>
-        <EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000035" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:iay.org.uk">
-    <!--
-        iay.org.uk is an SDSS project site running outside the University environment
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">morbius.iay.org.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">morbius.iay.org.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>origin.iay.org.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.iay.org.uk:8443/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">morbius.iay.org.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>origin.iay.org.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://origin.iay.org.uk:8444/shibboleth/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS Causewayside (1.2)</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS Causewayside (1.2)</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000036" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:idp.iay.org.uk">
-    <!--
-        idp.iay.org.uk is an SDSS project site running outside the University environment
-        This variation is a Shibboleth 1.3 testbed with the same characteristics as iay.org.uk above.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">morbius.iay.org.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">morbius.iay.org.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp.iay.org.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iay.org.uk:8448/shibboleth-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iay.org.uk:8447/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">morbius.iay.org.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp.iay.org.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iay.org.uk:8448/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">SDSS Causewayside</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">SDSS Causewayside</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Ian</GivenName>
-        <SurName>Young</SurName>
-        <EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000037" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:culloch.org">
-    <!--
-        culloch.org is another test identity provider for the SDSS project
-        running outside the University environment
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">culloch.org</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">culloch.org</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>www.culloch.org</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.culloch.org/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">culloch.org</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>www.culloch.org</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.culloch.org:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">culloch.org</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">culloch.org</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Fiona</GivenName>
-        <SurName>Culloch</SurName>
-        <EmailAddress>mailto:mbxuid-sdssmetadata at yahoo.co.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Fiona</GivenName>
-        <SurName>Culloch</SurName>
-        <EmailAddress>mailto:mbxuid-sdssmetadata at yahoo.co.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000038" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:dur.ac.uk">
-    <!--
-        dur.ac.uk is an identity provider for the University of Durham
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shib.dur.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shib.dur.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8443/shibboleth/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Durham University</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Durham University</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Andrew Stribblehill</GivenName>
-        <EmailAddress>mailto:shibboleth.support at durham.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Malcolm Murray</GivenName>
-        <EmailAddress>mailto:shibboleth.support at durham.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000039" entityID="https://shib.ecs.soton.ac.uk/shibboleth">
-	<!--
-		ecs.soton.ac.uk is an Identity Provider for the School of Engineering and Computer Science, University of Southampton
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ecs.soton.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ecs.soton.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shib.ecs.soton.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ecs.soton.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ecs.soton.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shib.ecs.soton.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ecs.soton.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">RAGS</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">RAGS</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://ecs.soton.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>David Mills</GivenName>
-		<EmailAddress>mailto:dgm at ecs.soton.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>David Mills</GivenName>
-		<EmailAddress>mailto:dgm at ecs.soton.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000040" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:matu.ac.uk">
-	<!--
-		edu-rd04.eduserv.org.uk is a test identity provider for MATU
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">matu.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">matu.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>edu-rd04.eduserv.org.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://edu-rd04.eduserv.org.uk:9443/matu-shib-idp-1.3/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">matu.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>edu-rd04.eduserv.org.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edu-rd04.eduserv.org.uk:8443/matu-shib-idp-1.3/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Matu</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Matu</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.matu.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Richard Annett</GivenName>
-		<EmailAddress>mailto:support at matu.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Richard Annett</GivenName>
-		<EmailAddress>mailto:support at matu.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000041" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:erewhon.ucs.ed.ac.uk">
-	<!--
-		erewhon.ucs.ed.ac.uk is an identity provider for the AMIE project
-		and for the University of Edinburgh
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">erewhon.ucs.ed.ac.uk</shibmeta:Scope>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">erewhon.ucs.ed.ac.uk</shibmeta:Scope>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>erewhon.ucs.ed.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://erewhon.ucs.ed.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">erewhon.ucs.ed.ac.uk</shibmeta:Scope>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>erewhon.ucs.ed.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://erewhon.ucs.ed.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University of Edinburgh</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Maddock</GivenName>
-		<EmailAddress>mailto:J.Maddock at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000042" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:exeter.ac.uk">
-	<!--
-		gilead.ex.ac.uk is an identity provider for project SWISh and for the University of Exeter
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>gilead.ex.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gilead.ex.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>gilead.ex.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gilead.ex.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University of Exeter</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University of Exeter</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Bill Edmunds</GivenName>
-		<EmailAddress>mailto:W.Edmunds at exeter.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Nick Johnson</GivenName>
-		<EmailAddress>mailto:Nick.Johnson at exeter.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Ian J. Tilsed</GivenName>
-		<EmailAddress>mailto:I.J.Tilsed at exeter.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000043" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:uhi.ac.uk">
-	<!--
-		guanxi.uhi.ac.uk is an identity provider for the Guanxi project
-		and for the University of the Highlands and Islands
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">uhi.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">uhi.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>guanxi.uhi.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://guanxi.uhi.ac.uk/idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">uhi.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>guanxi.uhi.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://guanxi.uhi.ac.uk/idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">UHI Millennium Institute</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">UHI Millennium Institute</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Alistair Young</GivenName>
-		<EmailAddress>mailto:alistair at smo.uhi.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000044" entityID="https://community.ncl.ac.uk/shibboleth/metadata">
-    <!--
-        https://community.ncl.ac.uk/shibboleth/metadata is a University of Newcastle SP for community wiki hosting.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>        
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>CN=community.ncl.ac.uk, OU=Computing Service, O=University of Newcastle upon Tyne, L=Newcastle upon Tyne, ST=England, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Newcastle</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Caleb</GivenName>
-        <SurName>Racey</SurName>
-        <EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Janet</GivenName>
-        <SurName>Wheeler</SurName>
-        <EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000045" entityID="https://idp-1.bgfl.org/shibboleth">
-    <!--
-        idp-1.bgfl.org is an identity provider for the Birmingham Grid for Learning
-        (Birmingham LEA)
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp-1.bgfl.org</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp-1.bgfl.org</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp-1.bgfl.org</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-1.bgfl.org/birmingham-education-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp-1.bgfl.org</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp-1.bgfl.org</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-1.bgfl.org:8443/birmingham-education-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Birmingham Grid for Learning</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Birmingham Grid for Learning</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.bgfl.org/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>BGfL Connectivity Team</GivenName>
-        <EmailAddress>mailto:connectivity at bgfl.org</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Simon Davies</GivenName>
-        <EmailAddress>mailto:Simon.Davies at birmingham.gov.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000046" entityID="https://idp.cardiff.ac.uk/shibboleth">
-    <!--
-        idp.cardiff.ac.uk is an identity provider for the ASMIMA project
-        and for Cardiff University
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp.cardiff.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cardiff.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp.cardiff.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardiff.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Cardiff University</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>The Shibboleth Team</GivenName>
-        <EmailAddress>mailto:shibboleth at cardiff.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>The Shibboleth Team</GivenName>
-        <EmailAddress>mailto:shibboleth at cardiff.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000047" entityID="https://idp-dev.cse.bris.ac.uk/shibboleth">
-    <!--
-        idp-dev.cse.bris.ac.uk is an identity provider for the Metaleth project
-        at the University of Bristol
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp-dev.cse.bris.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp-dev.cse.bris.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp-dev.cse.bris.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.cse.bris.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp-dev.cse.bris.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>idp-dev.cse.bris.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cse.bris.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Metaleth</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Metaleth</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">https://www.bris.ac.uk/is/about/projects/metaleth/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Jasper Tredgold</GivenName>
-        <EmailAddress>mailto:idp-dev-admin at bris.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Jasper Tredgold</GivenName>
-        <EmailAddress>mailto:idp-dev-admin at bris.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000048" entityID="https://idp.protectnetwork.org/protectnetwork-idp">
-    <!--
-        idp.protectnetwork.org is an open Identity Provider from ProtectNetwork
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>tcas-idp.protectnetwork.org</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tcas-idp.protectnetwork.org:8443/protectnetwork-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.protectnetwork.org/protectnetwork-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>tcas-idp.protectnetwork.org</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tcas-idp.protectnetwork.org:8443/protectnetwork-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">ProtectNetwork</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">ProtectNetwork</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.protectnetwork.org/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Tech Support</GivenName>
-        <EmailAddress>mailto:support at protectnetwork.org</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Tech Support</GivenName>
-        <EmailAddress>mailto:support at protectnetwork.org</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="support">
-        <GivenName>Tech Support</GivenName>
-        <EmailAddress>mailto:support at protectnetwork.org</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000049" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:jacinto.ucs.ed.ac.uk">
-    <!--
-        jacinto.ucs.ed.ac.uk is an identity provider for the AMIE project
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">jacinto.ucs.ed.ac.uk</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">jacinto.ucs.ed.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>jacinto.ucs.ed.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://jacinto.ucs.ed.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">jacinto.ucs.ed.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>jacinto.ucs.ed.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jacinto.ucs.ed.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">AMIE</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">AMIE</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>John Maddock</GivenName>
-        <EmailAddress>mailto:J.Maddock at ed.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000050" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:labpc-1.nesc.gla.ac.uk">
-	<!--
-		labpc-1.nesc.gla.ac.uk is a DyVOSE project test IdP
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">labpc-1.nesc.gla.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">labpc-1.nesc.gla.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>labpc-1.nesc.gla.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://labpc-1.nesc.gla.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">labpc-1.nesc.gla.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>labpc-1.nesc.gla.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://labpc-1.nesc.gla.ac.uk:8443/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University of Glasgow (test)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University of Glasgow (test)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://labserv.nesc.gla.ac.uk/projects/dyvose/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000051" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:lock.ncl.ac.uk">
-	<!--
-		lock.ncl.ac.uk is an identity provider for the IAMSECT project
-		and a test IdP for the University of Newcastle
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lock.ncl.ac.uk</shibmeta:Scope>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmeta:Scope>
-		<!-- omit this entity from the SDSS Federation WAYF -->
-		<wayf:HideFromWAYF xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"/>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lock.ncl.ac.uk</shibmeta:Scope>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>lock.ncl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lock.ncl.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lock.ncl.ac.uk</shibmeta:Scope>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>lock.ncl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lock.ncl.ac.uk:8443/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle test (do not use)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle test (do not use)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Caleb Racey</GivenName>
-		<EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000052" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:lse.ac.uk">
-	<!--
-		urn:mace:ac.uk:sdss.ac.uk:provider:identity:lse.ac.uk is an identity provider for the London School of Economics & Political Science.
-		The OrganizationName was changed from "LSE" to "Angel Project" on 10th November 2006.
-		(https://lse.ac.uk/idp, ID="uk000107", is another LSE IdP asserting the same domain as this one (lse.ac.uk). Its OrganizationName is "LSE".)
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>gate-test.library.lse.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gate-test.library.lse.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>gate-test.library.lse.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate-test.library.lse.ac.uk:8443/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">JISC Project: Angel</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">JISC Project: Angel</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.lse.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Simon McLeish</GivenName>
-		<EmailAddress>mailto:s.mcleish at lse.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Sally Rumsey</GivenName>
-		<EmailAddress>mailto:S.A.Rumsey at lse.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000053" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:medev-shib.ncl.ac.uk">
-	<!--
-		medev-shib.ncl.ac.uk is an identity provider for the University of Newcastle - Medical Sciences.
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">medev-shib.ncl.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">medev-shib.ncl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>medev-shib.ncl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://medev-shib.ncl.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">medev-shib.ncl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>medev-aa.ncl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://medev-aa.ncl.ac.uk/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle - Medical Sciences</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle - Medical Sciences</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/medev/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Snowdon</GivenName>
-		<EmailAddress>mailto:j.p.snowdon at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000054" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:mimas.ac.uk">
-	<!--
-		mimas.ac.uk is the identity provider for MIMAS
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.mimas.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mimas.ac.uk:8443/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.mimas.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mimas.ac.uk:8444/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">MIMAS</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">MIMAS</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>David Chaplin</GivenName>
-		<EmailAddress>mailto:david.chaplin at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Ross Macintyre</GivenName>
-		<EmailAddress>mailto:Ross.Macintyre at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000055" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:origin1.i2secure.org.uk">
-	<!--
-		origin1.i2secure.org.uk is an identity provider for i2secure,
-		an organisation working on a Shibboleth pilot project with BECTA.
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">origin1.i2secure.org.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">origin1.i2secure.org.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>origin1.i2secure.org.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin1.i2secure.org.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">origin1.i2secure.org.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>origin1.i2secure.org.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://origin1.i2secure.org.uk/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">i2secure</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">i2secure</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Jason</GivenName>
-		<SurName>Rousell</SurName>
-		<EmailAddress>mailto:jrousell at i2q.co.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Jason</GivenName>
-		<SurName>Rousell</SurName>
-		<EmailAddress>mailto:jrousell at i2q.co.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000056" entityID="https://oucs.ox.ac.uk/shibboleth">
-	<!--
-		oucs.ox.ac.uk is the identity provider for Oxford University Computing Services
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.oucs.ox.ac.uk</shibmeta:Scope>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">oucs.ox.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.oucs.ox.ac.uk</shibmeta:Scope>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">oucs.ox.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.oucs.ox.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.oucs.ox.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.oucs.ox.ac.uk</shibmeta:Scope>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">oucs.ox.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.oucs.ox.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oucs.ox.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Oxford University Computing Services (Test)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Oxford University Computing Services (Test)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Francisco Pinto</GivenName>
-		<EmailAddress>mailto:francisco.pinto at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Christian Fernau</GivenName>
-		<EmailAddress>mailto:christian.fernau at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Francisco Pinto</GivenName>
-		<EmailAddress>mailto:francisco.pinto at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000057" entityID="https://webauth.idp.oucs.ox.ac.uk/shibboleth">
-	<!--
-		shibboleth.oucs.ox.ac.uk is the identity provider for Oxford University
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.oucs.ox.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.oucs.ox.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.oucs.ox.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oucs.ox.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University of Oxford (test)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University of Oxford (test)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Christian</GivenName>
-		<SurName>Fernau</SurName>
-		<EmailAddress>mailto:christian.fernau at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Mike</GivenName>
-		<SurName>Fraser</SurName>
-		<EmailAddress>mailto:mike.fraser at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000058" entityID="https://idp.reidkerr.ac.uk/shibboleth">
-	<!--
-		reidkerr.ac.uk is the identity provider for the FEAR project
-		and for Reid Kerr College, Paisley.
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">reidkerr.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">reidkerr.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>IDP.reidkerr.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reidkerr.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">reidkerr.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>IDP.reidkerr.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reidkerr.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">FEAR</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">FEAR</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.reidkerr.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Michael Aherne</GivenName>
-		<EmailAddress>mailto:maherne at reidkerr.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Michael Aherne</GivenName>
-		<EmailAddress>mailto:maherne at reidkerr.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000059" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:safari.data-archive.ac.uk">	
-	<!--
-		safari.data-archive.ac.uk is the identity provider for the Safari project
-		at the UK Data Archive, University of Essex.
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">safari.data-archive.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">safari.data-archive.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>safari.data-archive.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://safari.data-archive.ac.uk:8080/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">safari.data-archive.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>safari.data-archive.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://safari.data-archive.ac.uk:8080/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SAFARI UKDA (origin)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SAFARI UKDA (origin)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Kosigin Liver Pitchikan</GivenName>
-		<EmailAddress>mailto:kliver at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Karen Dennison</GivenName>
-		<EmailAddress>mailto:kdenn at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000060" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:sdssorigin.kidderminster.ac.uk">
-	<!--
-		sdssorigin.kidderminster.ac.uk is the identity provider for the KC-ROLO project at Kidderminster College
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sdssorigin.kidderminster.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sdssorigin.kidderminster.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>sdssorigin.kidderminster.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sdssorigin.kidderminster.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sdssorigin.kidderminster.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>sdssorigin.kidderminster.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sdssorigin.kidderminster.ac.uk:8443/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">KC-ROLO</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">KC-ROLO</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Ed Beddows</GivenName>
-		<EmailAddress>mailto:ebeddows at kidderminster.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Graham Mason</GivenName>
-		<EmailAddress>mailto:gmason at kidderminster.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000061" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:leeds.ac.uk">
-	<!--
-		shibboleth.leeds.ac.uk is the identity provider for the University of Leeds and the GILEAD project
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.leeds.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		
-		<!-- 20060106: Ray Powell reports that this entity uses AthensIM software V1.0.1 -->
-		<NameIDFormat>urn:mace:eduserv.org.uk:athens:uuid</NameIDFormat>
-		
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.leeds.ac.uk/origin/hs"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth.leeds.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.leeds.ac.uk/origin/aa"/>
-		
-		<!-- 20060106: Ray Powell reports that this entity uses AthensIM software V1.0.1 -->
-		<NameIDFormat>urn:mace:eduserv.org.uk:athens:uuid</NameIDFormat>
-		
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University of Leeds</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University of Leeds</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.leeds.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Ray</GivenName>
-		<SurName>Powell</SurName>
-		<EmailAddress>mailto:R.G.Powell at leeds.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Nigel</GivenName>
-		<SurName>Bruce</SurName>
-		<EmailAddress>mailto:N.Bruce at leeds.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000062" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:shibboleth-i.sgul.ac.uk">
-	<!--
-		shibboleth-i.sgul.ac.uk is an IdP for St. George's University of London
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth-i.sgul.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-i.sgul.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shibboleth-i.sgul.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-i.sgul.ac.uk:8443/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">St George's University of London</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">St George's University of London</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Chris Gibson</GivenName>
-		<EmailAddress>mailto:cgibson at sgul.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Sysadmin</GivenName>
-		<EmailAddress>mailto:sysadmin at sgul.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000063" entityID="urn:mace:inqueue:systems.swan.ac.uk">
-	<!--
-		systems.swan.ac.uk is an IdP for the SHORE Project, University of Wales at Swansea
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">systems.swan.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">systems.swan.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>systems.swan.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ccs-shibboleth1.systems.swan.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">systems.swan.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>systems.swan.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ccs-shibboleth1.systems.swan.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SHORE</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SHORE</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.swan.ac.uk/lis/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Alexander Roberts</GivenName>
-		<EmailAddress>mailto:a.l.roberts at swansea.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alexander Roberts</GivenName>
-		<EmailAddress>mailto:a.l.roberts at swansea.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000064" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:titania.nesc.gla.ac.uk">	
-	<!--
-		titania.nesc.gla.ac.uk is an identity provider for the DyVOSE project
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">nesc.gla.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">nesc.gla.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>titania.nesc.gla.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://titania.nesc.gla.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">nesc.gla.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>titania.nesc.gla.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://titania.nesc.gla.ac.uk:8443/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">DyVOSE Project</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">DyVOSE Project</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000065" entityID="https://shib-idp.ucl.ac.uk/shibboleth">
-	<!--
-		ucl.ac.uk is the identity provider for UCL
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shib-idp.ucl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.ucl.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>shib-idp.ucl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.ucl.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University College, London</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University College, London</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Adrian Barker</GivenName>
-		<EmailAddress>mailto:systems at ucl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Jan Cropper</GivenName>
-		<EmailAddress>mailto:lib-aleph-support at ucl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000066" entityID="https://vadar.ncl.ac.uk/shibboleth">
-	<!--
-		vadar.ncl.ac.uk is a test IdP for the IAMSECT project
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">vadar.ncl.ac.uk</shibmeta:Scope>
-		<wayf:HideFromWAYF xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF">
-			<!-- omit this entity from the SDSS Federation WAYF -->				
-		</wayf:HideFromWAYF>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">vadar.ncl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>vadar.ncl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vadar.ncl.ac.uk/shibboleth/HS"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">vadar.ncl.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>vadar.ncl.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vadar.ncl.ac.uk:8443/shibboleth/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle windev (do not use)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle windev (do not use)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/external/about.phtml</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Caleb Racey</GivenName>
-		<EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000067" entityID="https://idp.xenophobe.ahds.ac.uk/shibboleth">
-	<!--
-		xenophobe.ahds.ac.uk is an identity provider for the Arts and Humanities Data Service (AHDS).
-	-->
-	<Extensions>
-		<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">xenophobe.ahds.ac.uk</shibmeta:Scope>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">xenophobe.ahds.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>xenophobe.ahds.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://xenophobe.ahds.ac.uk/shibboleth-idp/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<Extensions>
-			<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">xenophobe.ahds.ac.uk</shibmeta:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>xenophobe.ahds.ac.uk</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://xenophobe.ahds.ac.uk:8443/shibboleth-idp/AA"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">AHDS, King's College</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">AHDS, King's College</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://ahds.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Sanjay Vivek</GivenName>
-		<EmailAddress>mailto:sanjay.vivekanandan at ahds.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Mark Hedges</GivenName>
-		<EmailAddress>mailto:mark.hedges at ahds.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000068" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:nevis.ed.ac.uk">
-	<!--
-		nevis.ed.ac.uk is an SDSS project target running Shibboleth 1.3
-		and supporting several EDINA services
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=nevis.ed.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<!-- Note: Assertion Consumer is SSL at two non-standard ports and the standard one. -->
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nevis.ed.ac.uk:8883/Shibboleth.sso/SAML/POST" index="1"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nevis.ed.ac.uk/Shibboleth.sso/SAML/POST" index="2"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nevis.ed.ac.uk:8885/Shibboleth.sso/SAML/POST" index="3"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">EDINA Nevis Services</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">EDINA Nevis Services</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Ian</GivenName>
-		<SurName>Young</SurName>
-		<EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000069" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:target.sdss.ac.uk">
-	<!--
-		target.sdss.ac.uk is the primary SDSS project test target.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=target.sdss.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target.sdss.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SDSS Test Target</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SDSS Test Target</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Ian</GivenName>
-		<SurName>Young</SurName>
-		<EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000070" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:culloch.org">
-	<!--
-		culloch.org is another SDSS test target outside the University network
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>www.culloch.org</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.culloch.org/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">FC</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">FC</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Fiona</GivenName>
-		<SurName>Culloch</SurName>
-		<EmailAddress>mailto:mbxuid-sdssmetadata at yahoo.co.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Fiona</GivenName>
-		<SurName>Culloch</SurName>
-		<EmailAddress>mailto:mbxuid-sdssmetadata at yahoo.co.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000071" entityID="https://slioch.ucs.ed.ac.uk/shibboleth">
-	<!--
-		slioch.ucs.ed.ac.uk is another SDSS test service provider
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=slioch.ucs.ed.ac.uk, OU=sdss slioch-test, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slioch.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">sdss slioch-test sp</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">sdss slioch-test sp</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Murison</GivenName>
-		<EmailAddress>mailto:J.Murison at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>John Murison</GivenName>
-		<EmailAddress>mailto:J.Murison at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000072" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:dearg.ucs.ed.ac.uk">
-	<!--
-		dearg.ucs.ed.ac.uk is the Edina Geo services machine
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=dearg.ucs.ed.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dearg.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dearg.ucs.ed.ac.uk/Shibboleth.shire" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Edina Geo</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Edina Geo</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Jennie Robertson</GivenName>
-		<EmailAddress>mailto:jennie.robertson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000073" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:edina.ac.uk:digimap">
-	<!--
-		edina.ac.uk:digimap is a test service provider for Edina Digimap (beta)
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=dearg.ucs.ed.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dearg.ucs.ed.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="0"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dearg.ucs.ed.ac.uk/digimap/Shibboleth.shire" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Digimap (beta)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Digimap (beta)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Jennie Robertson</GivenName>
-		<EmailAddress>mailto:jennie.robertson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000074" entityID="https://geoshibb.edina.ac.uk/shibboleth">
-	<!--
-		geoshibb.edina.ac.uk is a service provider for Edina Digimap (live)
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=geoshibb.edina.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geoshibb.edina.ac.uk/Shibboleth.shire" index="0"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geoshibb.edina.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Digimap (live)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Digimap (live)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Jennie Robertson</GivenName>
-		<EmailAddress>mailto:jennie.robertson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000075" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:emol.sdss.ac.uk">
-	<!--
-		emol.sdss.ac.uk is the SDSS project production target for the Edina Education Media Online service.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=target.sdss.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target.sdss.ac.uk/emol/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SDSS Edina Emol</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SDSS Edina Emol</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Ian</GivenName>
-		<SurName>Young</SurName>
-		<EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000076" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:eig.sdss.ac.uk">
-	<!--
-		eig.sdss.ac.uk is the SDSS project production target for the Edina Education Image Gallery service.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=target.sdss.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target.sdss.ac.uk/eig/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SDSS Edina Eig</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SDSS Edina Eig</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Ian</GivenName>
-		<SurName>Young</SurName>
-		<EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000077" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:edina.ac.uk:jorum">
-	<!--
-		edina.ac.uk:jorum is the SDSS project production target for Edina Jorum service.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=target.sdss.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target.sdss.ac.uk/jorum/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SDSS Edina Jorum</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SDSS Edina Jorum</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Ian</GivenName>
-		<SurName>Young</SurName>
-		<EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000078" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:edina.ac.uk:statacc">
-	<!--
-		edina.ac.uk:statacc is the SDSS project production target for the Edina Statistical Accounts of Scotland service.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=target.sdss.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target.sdss.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SDSS Edina Statistical Accounts of Scotland</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SDSS Edina Statistical Accounts of Scotland</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Ian</GivenName>
-		<SurName>Young</SurName>
-		<EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000079" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:times-index.sdss.ac.uk">
-	<!--
-		times-index.sdss.ac.uk is the SDSS project production target for the Edina Times-Index service.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=target.sdss.ac.uk, OU=JISC Core Middleware Programme - SDSS Project, O=EDINA - University of Edinburgh, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target.sdss.ac.uk/times-index/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SDSS Edina Times-Index</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SDSS Edina Times-Index</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://sdss.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>SDSS Support List</GivenName>
-		<EmailAddress>mailto:sdss-support at lists.ed.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Ian</GivenName>
-		<SurName>Young</SurName>
-		<EmailAddress>mailto:ian at iay.org.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Alan</GivenName>
-		<SurName>Ferguson</SurName>
-		<EmailAddress>mailto:Alan.Ferguson at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000080" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:bruno.dur.ac.uk">
-	<!--
-		bruno.dur.ac.uk is the Durham University Blackboard Development Server (Bruno) target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=bruno.dur.ac.uk, OU=Information Technology Service, O=University of Durham, L=Durham, ST=England, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bruno.dur.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Durham University Blackboard Development Server (Bruno)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Durham University Blackboard Development Server (Bruno)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.dur.ac.uk/about/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Michael Young</GivenName>
-		<EmailAddress>mailto:m.a.young at durham.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Malcolm Murray</GivenName>
-		<EmailAddress>mailto:malcolm.murray at durham.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000081" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:chcc.essex.ac.uk">
-	<!--
-		CHCC is a target for the Safari Project, UK Data Archive
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=chcc.essex.ac.uk, OU=UK Data Archive, O=University of Essex, L=COLCHESTER, ST=Essex, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chcc.essex.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">CHCC</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">CHCC</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Kosigin Liver Pitchikan</GivenName>
-		<EmailAddress>mailto:kliver at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Karen Dennison</GivenName>
-		<EmailAddress>mailto:kdenn at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000082" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:census.data-archive.ac.uk">
-	<!--
-		census.data-archive.ac.uk is a target for the UK Data Archive
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=census.data-archive.ac.uk, OU=CRS, O=UKDA, L=COLCHESTER, ST=ESSEX, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.data-archive.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.data-archive.ac.uk:8080/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">CRS</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">CRS</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Kosigin Liver Pitchikan</GivenName>
-		<EmailAddress>mailto:kliver at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Karen Dennison</GivenName>
-		<EmailAddress>mailto:kdenn at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000083" entityID="https://blackhall.ncl.ac.uk/shibboleth/metadata">
-	<!--
-		blackhall.ncl.ac.uk is an SP for the University of Newcastle upon Tyne and the IAMSECT project
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=blackhall.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blackhall.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Caleb Racey</GivenName>
-		<EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000084" entityID="https://crypt.ncl.ac.uk/shibboleth/metadata">
-	<!--
-		crypt.ncl.ac.uk is a target for the University of Newcastle upon Tyne and the IAMSECT project
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=crypt.ncl.ac.uk, OU=Computing Service, O=University of Newcastle upon Tyne, L=Newcastle upon Tyne, ST=England, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crypt.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Caleb Racey</GivenName>
-		<EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000085" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:labpc-2.nesc.gla.ac.uk">
-	<!--
-		labpc-2.nesc.gla.ac.uk is a GLASS project target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=labpc-2.nesc.gla.ac.uk, OU=GLASS Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://labpc-2.nesc.gla.ac.uk/Shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University of Glasgow (test)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University of Glasgow (test)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://labserv.nesc.gla.ac.uk/projects/dyvose/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000086" entityID="https://labpc-5.nesc.gla.ac.uk/shibboleth">
-	<!--
-		labpc-5.nesc.gla.ac.uk is a GLASS project target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=labpc-5.nesc.gla.ac.uk,OU=GLASS Project,O=JISC Core Middleware Programme,C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://labpc-5.nesc.gla.ac.uk/Shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">University of Glasgow (test)</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">University of Glasgow (test)</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://labserv.nesc.gla.ac.uk/projects/glass/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000087" entityID="https://medev-services.ncl.ac.uk/shibboleth">
-	<!--
-		medev-services.ncl.ac.uk is a gateway Shibboleth box at Newcastle that will front onto all the pre-existing zope based VLEs.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=medev-services.ncl.ac.uk, OU=Faculty of Medical Sciences Computing, O=University of Newcastle upon Tyne, L=Newcastle upon Tyne, ST=England, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medev-services.ncl.ac.uk/shibboleth/SSO/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle Medical Services</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle Medical Services</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/medev/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Snowdon</GivenName>
-		<EmailAddress>mailto:j.p.snowdon at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000088" entityID="https://st-shibboleth.bham.org.uk/shibboleth">
-	<!--
-		myinternet_preview is a target for 'Netmedia Education', working with its partner 'myinternet Ltd' from Australia.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=st-shibboleth.bham.org.uk, OU=Link2ICT, O=Service Birmingham, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://st-shibboleth.bham.org.uk/shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">myinternet_preview</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">myinternet_preview</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.netmedia-ed.co.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Scott Penrose</GivenName>
-		<EmailAddress>mailto:scottp at myinternet.com.au</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Joe Porter</GivenName>
-		<EmailAddress>mailto:joe at netmediaeducation.com</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000089" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:pecos.ucs.ed.ac.uk">
-	<!--
-		pecos.ucs.ed.ac.uk is the AMIE project's test target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=pecos.ucs.ed.ac.uk, OU=AMIE Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pecos.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">AMIE</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">AMIE</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Maddock</GivenName>
-		<EmailAddress>mailto:J.Maddock at ed.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000090" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:pioneer.nesc.gla.ac.uk">
-	<!--
-		pioneer.nesc.gla.ac.uk is a DyVOSE project target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=pioneer.nesc.gla.ac.uk, OU=DyVOSE Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pioneer.nesc.gla.ac.uk/Shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">DyVOSE Project</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">DyVOSE Project</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>John Watt</GivenName>
-		<EmailAddress>mailto:jwatt at dcs.gla.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000091" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:safari.data-archive.ac.uk">
-	<!--
-		safari.data-archive.ac.uk Safari project target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=safari.data-archive.ac.uk, OU=JISC Core Middleware Programme - Safari Project, O=University of Essex, L=Colchester, ST=Essex, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://safari.data-archive.ac.uk:8080/Shibboleth.sso/SAML/POST" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SAFARI UKDA</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SAFARI UKDA</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Kosigin Liver Pitchikan</GivenName>
-		<EmailAddress>mailto:kliver at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Karen Dennison</GivenName>
-		<EmailAddress>mailto:kdenn at essex.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000092" entityID="https://sdauth.sciencedirect.com/">
-	<!--
-		ScienceDirect target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="0"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth-cert3.sciencedirect.com/SHIRE" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">ScienceDirect</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">ScienceDirect</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://info.sciencedirect.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Jason Maddox</GivenName>
-		<EmailAddress>mailto:Jason.Maddox at lexisnexis.com</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Application Support</GivenName>
-		<EmailAddress>mailto:EDITAppSupp at lexisnexis.com</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000093" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:shibboleth-hairdressing.mimas.ac.uk">
-	<!--
-		shibboleth-hairdressing.mimas.ac.uk is the MIMAS hairdressing training service
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=shibboleth-hairdressing.mimas.ac.uk, OU=MIMAS Hairdressing Training, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-hairdressing.mimas.ac.uk:8443/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">MIMAS Hairdressing Training</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">MIMAS Hairdressing Training</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>David Chaplin</GivenName>
-		<EmailAddress>mailto:david.chaplin at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Ross MacIntyre</GivenName>
-		<EmailAddress>mailto:Ross.MacIntyre at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000094" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:shibboleth-landmap.mimas.ac.uk">
-	<!--
-		shibboleth-landmap.mimas.ac.uk is the MIMAS Landmap service
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=shibboleth-landmap.mimas.ac.uk, OU=MIMAS Landmap Service, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-landmap.mimas.ac.uk:7443/Shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">MIMAS Landmap Service</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">MIMAS Landmap Service</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>David Chaplin</GivenName>
-		<EmailAddress>mailto:david.chaplin at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Ross MacIntyre</GivenName>
-		<EmailAddress>mailto:Ross.MacIntyre at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000095" entityID="https://spie.oucs.ox.ac.uk/shibboleth/wiki">
-	<!--
-		shibboleth.oucs.ox.ac.uk is the SPIE project's test target
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=shibboleth.oucs.ox.ac.uk, OU=SPIE Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.oucs.ox.ac.uk:8464/sdss/Shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">SPIE Secure SDSS</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">SPIE Secure SDSS</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Francisco Pinto</GivenName>
-		<EmailAddress>mailto:francisco.pinto at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Christian Fernau</GivenName>
-		<EmailAddress>mailto:christian.fernau at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Francisco Pinto</GivenName>
-		<EmailAddress>mailto:francisco.pinto at oucs.ox.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000096" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:shibboleth.sgul.ac.uk">
-	<!--
-		shibboleth.sgul.ac.uk is the SP for St. George's University of London
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=shibboleth.sgul.ac.uk, OU=Computing Unit, O=St George's University of London, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.sgul.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.sgul.ac.uk/Shibboleth.sso/SAML/Artifact" index="3"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">St George's University of London</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">St George's University of London</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Stéphane Konstantaropoulos</GivenName>
-		<EmailAddress>mailto:s.konstantaropoulos at sgul.ac.uk</EmailAddress> 	
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Sysadmin</GivenName>
-		<EmailAddress>mailto:sysadmin at sgul.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000097" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:target1.i2secure.org.uk">
-	<!--
-		target1.i2secure.org.uk is a test target for i2secure,
-		an organisation working with BECTA on a Shibboleth pilot.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=target1.i2secure.org.uk, O=i2Q Ltd, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://target1.i2secure.org.uk/Shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">target1_i2secure</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">target1_i2secure</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.i2q.co.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Jason</GivenName>
-		<SurName>Rousell</SurName>
-		<EmailAddress>mailto:jrousell at i2q.co.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Jason</GivenName>
-		<SurName>Rousell</SurName>
-		<EmailAddress>mailto:jrousell at i2q.co.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000098" entityID="https://unixmon.ncl.ac.uk/shibboleth/metadata">
-	<!--
-		unixmon.ncl.ac.uk is a target for the University of Newcastle upon Tyne and the IAMSECT project
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=unixmon.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unixmon.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Caleb Racey</GivenName>
-		<EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000099" entityID="https://www.ncl.ac.uk/shibboleth/metadata">
-	<!--
-		www.ncl.ac.uk is a target for the University of Newcastle upon Tyne and the IAMSECT project
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=www.ncl.ac.uk, OU=IAMSECT Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Caleb Racey</GivenName>
-		<EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000100" entityID="https://wwwtest.ncl.ac.uk/shibboleth/metadata">
-	<!--
-		wwwtest.ncl.ac.uk is a test target for the IAMSECT project
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=wwwtest.ncl.ac.uk, OU=IAMSECT, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwtest.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Newcastle</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Newcastle</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.ncl.ac.uk/iss/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Caleb Racey</GivenName>
-		<EmailAddress>mailto:Caleb.Racey at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Janet Wheeler</GivenName>
-		<EmailAddress>mailto:J.E.Wheeler at ncl.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000101" entityID="https://sp.xenophobe.ahds.ac.uk/shibboleth">
-	<!--
-		xenophobe.ahds.ac.uk is a Service Provider for the Arts and Humanities Data Service (AHDS).
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=xenophobe.ahds.ac.uk, OU=SERAPIS Project, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xenophobe.ahds.ac.uk:440/Shibboleth.sso/SAML/POST" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">AHDS, King's College</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">AHDS, King's College</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://ahds.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Sanjay Vivek</GivenName>
-		<EmailAddress>mailto:sanjay.vivekanandan at ahds.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Mark Hedges</GivenName>
-		<EmailAddress>mailto:mark.hedges at ahds.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000102" entityID="https://xfire.mimas.ac.uk/shibboleth">
-	<!--
-		xfire.mimas.ac.uk is a Service Provider for the MIMAS CrossFire service
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=xfire.mimas.ac.uk, OU=MIMAS CrossFire Service, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xfire.mimas.ac.uk:7443/Shibboleth.sso/SAML/POST" index="0"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://xfire.mimas.ac.uk:7443/Shibboleth.sso/SAML/Artifact" index="1"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">MIMAS CrossFire Service</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">MIMAS CrossFire Service</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.mimas.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>David</GivenName>
-		<SurName>Chaplin</SurName>
-		<EmailAddress>mailto:david.chaplin at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Ross</GivenName>
-		<SurName>MacIntyre</SurName>
-		<EmailAddress>mailto:Ross.MacIntyre at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000103" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:zetoc.mimas.ac.uk">
-	<!--
-		zetoc.mimas.ac.uk is the Zetoc target at MIMAS
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>CN=zetoc.mimas.ac.uk, OU=MIMAS Zetoc Service, O=JISC Core Middleware Programme, C=GB</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zetoc.mimas.ac.uk:8443/Shibboleth.shire" index="0"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">MIMAS Zetoc Service</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">MIMAS Zetoc Service</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Andrew Weeks</GivenName>
-		<EmailAddress>mailto:a.weeks at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Ross MacIntyre</GivenName>
-		<EmailAddress>mailto:Ross.Macintyre at manchester.ac.uk</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000104" entityID="https://wiki.it.ohio-state.edu/shibboleth">
-	<!--
-		Shibboleth community Wiki run by Scott Cantor <cantor.2 at osu.edu> at Ohio State.
-	-->
-	<Extensions>
-		<SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-			<!-- 
-				The owner of this entity has agreed to the 
-				SDSS Federation policy, but has not yet 
-				agreed to the UK Federation's Rules of Membership. 
-			--> 
-		</SDSSPolicy>		
-	</Extensions>
-	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-		<KeyDescriptor>
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:KeyName>wiki.it.ohio-state.edu</ds:KeyName>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="0"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="1"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="2"/>
-		<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="3"/>
-	</SPSSODescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">Ohio State IT Wiki</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">Ohio State IT Wiki</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.example.com/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="technical">
-		<GivenName>Web-Auth Mailing List</GivenName>
-		<EmailAddress>mailto:webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="administrative">
-		<GivenName>Web-Auth Mailing List</GivenName>
-		<EmailAddress>mailto:webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-	</ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000105" entityID="https://auth.rsc-south-west.ac.uk/shibboleth">
-    <!--
-        https://auth.rsc-south-west.ac.uk/shibboleth is an Identity Provider for  the JISC South West Regional Support Centre.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">rsc-south-west.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>		
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">rsc-south-west.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>auth.rsc-south-west.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.rsc-south-west.ac.uk:8443/shibboleth-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.rsc-south-west.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">rsc-south-west.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>auth.rsc-south-west.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.rsc-south-west.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">RSC South West</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">RSC South West</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.rsc-south-west.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>RSC Advice</GivenName>
-        <EmailAddress>mailto:rsc-advice at rsc-south-west.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Brook</GivenName>
-        <SurName>Schofield</SurName>
-        <EmailAddress>mailto:bschofield at rsc-south-west.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Brook</GivenName>
-        <SurName>Schofield</SurName>
-        <EmailAddress>mailto:bschofield at rsc-south-west.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000106" entityID="https://krad.cityplym.ac.uk/shibboleth">
-    <!--
-        https://krad.cityplym.ac.uk/shibboleth is an Identity Provider for City College Plymouth.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">krad.cityplym.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>		
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">krad.cityplym.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>krad.cityplym.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://krad.cityplym.ac.uk:8443/shibboleth-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://krad.cityplym.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">krad.cityplym.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>krad.cityplym.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://krad.cityplym.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">City College Plymouth</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">City College Plymouth</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.cityplym.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Help desk (01752 305355)</GivenName>
-        <EmailAddress>mailto:support at cityplym.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Luke</GivenName>
-        <SurName>Cameron</SurName>
-        <EmailAddress>mailto:lcameron at cityplym.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Chris</GivenName>
-        <SurName>Zisimides</SurName>
-        <EmailAddress>mailto:czisimides at cityplym.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000107" entityID="https://lse.ac.uk/idp">
-    <!--
-        https://lse.ac.uk/idp is an Identity Provider for the London School of Economics and Political Science.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>		
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gate.library.lse.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/shibboleth-idp/Artifact" index="1"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gate.library.lse.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gate.library.lse.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">London School of Economics and Political Science</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">London School of Economics and Political Science</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.lse.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Michael</GivenName>
-        <SurName>McFarlane</SurName>
-        <EmailAddress>mailto:m.d.mcfarlane at lse.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Michael</GivenName>
-        <SurName>McFarlane</SurName>
-        <EmailAddress>mailto:m.d.mcfarlane at lse.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000108" entityID="https://auth.rsc-south-west.ac.uk/shibboleth-sp">
-    <!--
-        https://auth.rsc-south-west.ac.uk/shibboleth-sp is a Service Provider for  the JISC South West Regional Support Centre.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>		
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>emailAddress=support at rsc-south-west.ac.uk, CN=auth.rsc-south-west.ac.uk, OU=IT, O=RSC South West, L=Plymouth, ST=Devon, C=GB</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.rsc-south-west.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.rsc-south-west.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">RSC South West</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">RSC South West</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.rsc-south-west.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>RSC Advice</GivenName>
-        <EmailAddress>mailto:rsc-advice at rsc-south-west.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Brook</GivenName>
-        <SurName>Schofield</SurName>
-        <EmailAddress>mailto:bschofield at rsc-south-west.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Brook</GivenName>
-        <SurName>Schofield</SurName>
-        <EmailAddress>mailto:bschofield at rsc-south-west.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000109" entityID="https://www.ltscotland.org.uk/shibboleth">
-    <!--
-        https://www.ltscotland.org.uk/shibboleth is a Service provider for Learning and Teaching Scotland.
-    -->
-    <Extensions>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>		
-    </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>www.ltscotland.org.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ltscotland.org.uk/Shibboleth.sso/SAML/POST" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ltscotland.org.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">LTScotland</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">LTScotland</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.ltscotland.org.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Mike</GivenName>
-        <SurName>Thomas</SurName>
-        <EmailAddress>mailto:m.thomas at ltscotland.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Mike</GivenName>
-        <SurName>Thomas</SurName>
-        <EmailAddress>mailto:m.thomas at ltscotland.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Mike</GivenName>
-        <SurName>Thomas</SurName>
-        <EmailAddress>mailto:m.thomas at ltscotland.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000111" entityID="urn:mace:eduserv.org.uk:athens:federation:uk">
-    <!--
-        This is the production Athens/Shibboleth gateway. The entity is a combined IdP and SP.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">athensams.net</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmeta:Scope>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">athensams.net</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gateway.athensams.net</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">athensams.net</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmeta:Scope>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gateway.athensams.net</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor> 
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>gateway.athensams.net</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.athensams.net/saml/AfctRcv" index="0"/>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.athensams.net/saml/PostRcv" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Eduserv Athens</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Eduserv Athens</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.athensams.net/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="support">
-        <GivenName>Athens Helpdesk</GivenName>
-        <EmailAddress>mailto:athenshelp at eduserv.org.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-        <GivenName>Tom</GivenName>
-        <SurName>Demeranville</SurName>
-        <EmailAddress>mailto:tnd at eduserv.org.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor ID="uk000112" entityID="https://shibboleth.imperial.ac.uk/shibboleth">
-    <!--
-        https://shibboleth.imperial.ac.uk/shibboleth is an IdP for Imperial College London.
-    -->
-    <Extensions>
-        <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmeta:Scope>
-        <SDSSPolicy xmlns="http://ukfederation.org.uk/2006/11/label"> 
-            <!-- 
-                The owner of this entity has agreed to the 
-                SDSS Federation policy, but has not yet 
-                agreed to the UK Federation's Rules of Membership. 
-            --> 
-        </SDSSPolicy>
-    </Extensions>
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibboleth.imperial.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.imperial.ac.uk/shibboleth-idp/SSO"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-        <Extensions>
-            <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmeta:Scope>
-        </Extensions>
-        <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:KeyName>shibboleth.imperial.ac.uk</ds:KeyName>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.imperial.ac.uk:8443/shibboleth-idp/AA"/>
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-        <OrganizationName xml:lang="en">Imperial College London</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Imperial College London</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.imperial.ac.uk/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Neil</GivenName>
-        <SurName>McLennan</SurName>
-        <EmailAddress>mailto:n.mclennan at imperial.ac.uk</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-        <GivenName>Neil</GivenName>
-        <SurName>McLennan</SurName>
-        <EmailAddress>mailto:n.mclennan at imperial.ac.uk</EmailAddress>
-    </ContactPerson>
-</EntityDescriptor>
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops
deleted file mode 100644
index 20f8425..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 133
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty
-END
-service-config.xml
-K 25
-svn:wc:ra_dav:version-url
-V 151
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/service-config.xml
-END
-relying-party1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 152
-/java-shib-common/!svn/ver/1051/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/relying-party1.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries
deleted file mode 100644
index 1c97928..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-service-config.xml
-file
-
-
-
-
-2014-02-19T17:27:40.518734Z
-648ff87a710ae880b6238a7bb767109d
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1026
-

-relying-party1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.518734Z
-93c6cb5fd81693b60296f885eb79c80a
-2013-01-23T19:54:30.224387Z
-1051
-scantor
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1696
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/relying-party1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/relying-party1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/relying-party1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/service-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/service-config.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/prop-base/service-config.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/relying-party1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/relying-party1.xml.svn-base
deleted file mode 100644
index 49b9638..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/relying-party1.xml.svn-base
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    This file specifies relying party dependent configurations for the IdP, for example, whether SAML assertions to a 
-    particular relying party should be signed.  It also includes metadata provider and credential definitions used 
-    when answering requests to a relying party.
--->
-<RelyingPartyGroup xmlns="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:credential="urn:mace:shibboleth:2.0:credential" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party classpath:/schema/shibboleth-2.0-relying-party.xsd                                        urn:mace:shibboleth:2.0:relying-party:saml classpath:/schema/shib [...]
-                                       
-    <AnonymousRelyingParty provider="http://example.org/IdP/anon"/>
-    
-    <DefaultRelyingParty provider="http://example.org/IdP/default"/>
-    
-    <RelyingParty id="urn:mace:incommon" provider="http://example.org/IdP/InC"/>
-    
-    <MetadataProvider xmlns="urn:mace:shibboleth:2.0:metadata" xsi:type="HTTPMetadataProvider" id="incommon-metadata" metadataURL="https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/metadata/InCommon-metadata.xml"/>
-    
-</RelyingPartyGroup>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/service-config.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/service-config.xml.svn-base
deleted file mode 100644
index 7ca16fb..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/.svn/text-base/service-config.xml.svn-base
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
-    <bean id="config1" class="org.opensaml.util.resource.ClasspathResource">
-        <constructor-arg value="/data/edu/internet2/middleware/shibboleth/common/config/relyingparty/relying-party1.xml"/>
-    </bean>
-
-    <bean id="relyingPartyManager" class="edu.internet2.middleware.shibboleth.common.relyingparty.provider.SAMLMDRelyingPartyConfigurationManager" init-method="initialize">
-        <property name="serviceConfigurations">
-            <list>
-                <ref bean="config1"/>
-            </list>
-        </property>
-    </bean>
-
-</beans>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops
deleted file mode 100644
index 49c95b8..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/all-wcprops
+++ /dev/null
@@ -1,89 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 128
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security
-END
-PKIXValidationOptions4.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationOptions4.xml
-END
-StaticPKIXSignatureTrustEngine-Options.xml
-K 25
-svn:wc:ra_dav:version-url
-V 171
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXSignatureTrustEngine-Options.xml
-END
-StaticPKIXX509CredentialTrustEngine1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXX509CredentialTrustEngine1.xml
-END
-CertPathPKIXValidationOptions1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptions1.xml
-END
-StaticPKIXSignatureTrustEngine1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXSignatureTrustEngine1.xml
-END
-StaticPKIXX509CredentialTrustEngine2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 169
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXX509CredentialTrustEngine2.xml
-END
-CertPathPKIXValidationOptions2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptions2.xml
-END
-StaticPKIXSignatureTrustEngine2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 164
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXSignatureTrustEngine2.xml
-END
-CertPathPKIXValidationOptions3.xml
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/CertPathPKIXValidationOptions3.xml
-END
-MetadataPKIXTrustEngines-Options.xml
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/MetadataPKIXTrustEngines-Options.xml
-END
-PKIXValidationOptions1.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationOptions1.xml
-END
-PKIXValidationOptions2.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationOptions2.xml
-END
-PKIXValidationOptions3.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/PKIXValidationOptions3.xml
-END
-StaticPKIXX509CredentialTrustEngine-Options.xml
-K 25
-svn:wc:ra_dav:version-url
-V 176
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/StaticPKIXX509CredentialTrustEngine-Options.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries
deleted file mode 100644
index a69c8f3..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/entries
+++ /dev/null
@@ -1,504 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-PKIXValidationOptions3.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-e7484d9a8fbf10834f52bfda7a238b86
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-384
-

-StaticPKIXX509CredentialTrustEngine-Options.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-f17b6b4a9265a79d93c664f4a10feddd
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2551
-

-PKIXValidationOptions4.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-a1eee726651bd0498b80dfa96049e831
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-406
-

-StaticPKIXSignatureTrustEngine-Options.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-ef63879547e035d647d76692e777c3cb
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2541
-

-StaticPKIXX509CredentialTrustEngine1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-8cb4af5fb4b390669579b360372e7151
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2294
-

-CertPathPKIXValidationOptions1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.518734Z
-178e595e0091a12b2412184a96b574f1
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-323
-

-StaticPKIXSignatureTrustEngine1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.518734Z
-fa1b03e6a3fa7c6c75e839a5b0b98fd5
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2284
-

-StaticPKIXX509CredentialTrustEngine2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.518734Z
-513545573d5a206e2fa0def85959c45f
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-688
-

-CertPathPKIXValidationOptions2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.518734Z
-d16a14e11b38fbcc86d6628853d31750
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-490
-

-StaticPKIXSignatureTrustEngine2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.518734Z
-5a6bc125aab6b136731bf5032ffeafe3
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-678
-

-CertPathPKIXValidationOptions3.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-35a021aaa2fa0c451aa879fe0f5c18cb
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-345
-

-MetadataPKIXTrustEngines-Options.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-d09cb7950616f0e486e8e69702b28886
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2834
-

-PKIXValidationOptions1.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-32c2eb10c9be2149f778458355a3209c
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-273
-

-PKIXValidationOptions2.xml
-file
-
-
-
-
-2014-02-19T17:27:40.514734Z
-631ca345651d096931e2d25279b382b2
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-315
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions3.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/CertPathPKIXValidationOptions3.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXTrustEngines-Options.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXTrustEngines-Options.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/MetadataPKIXTrustEngines-Options.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions3.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions3.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions4.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions4.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/PKIXValidationOptions4.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine-Options.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine-Options.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine-Options.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXSignatureTrustEngine2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine-Options.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine-Options.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine-Options.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine1.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine1.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine2.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/prop-base/StaticPKIXX509CredentialTrustEngine2.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions1.xml.svn-base
deleted file mode 100644
index 4d7143f..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions1.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" xsi:type="security:CertPathValidationOptionsType" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions2.xml.svn-base
deleted file mode 100644
index 99af749..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions2.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" xsi:type="security:CertPathValidationOptionsType" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd" processEmptyCRLs="false" processExpiredCRLs="false" processCredentialCRLs="false" defaultVerificationDepth="3" forceRevocationEnabled="true" revocationEnabled="false"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions3.xml.svn-base
deleted file mode 100644
index b86d74d..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/CertPathPKIXValidationOptions3.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" xsi:type="security:CertPathValidationOptionsType" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd" badAttribute="foobar"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXTrustEngines-Options.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXTrustEngines-Options.xml.svn-base
deleted file mode 100644
index 9ee2045..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/MetadataPKIXTrustEngines-Options.xml.svn-base
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    This file specifies relying party dependent configurations for the IdP, for example, whether SAML assertions to a 
-    particular relying party should be signed.  It also includes metadata provider and credential definitions used 
-    when answering requests to a relying party.
--->
-<RelyingPartyGroup xmlns="urn:mace:shibboleth:2.0:relying-party" xmlns:saml="urn:mace:shibboleth:2.0:relying-party:saml" xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:credential="urn:mace:shibboleth:2.0:credential" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mace:shibboleth:2.0:relying-party classpath:/schema/shibboleth-2.0-relying-party.xsd                                        urn:mace:shibboleth:2.0:relying-party:saml classpath:/schema/shib [...]
-                                       
-    <AnonymousRelyingParty provider="http://example.org/IdP/anon"/>
-    
-    <DefaultRelyingParty provider="http://example.org/IdP/default"/>
-    
-    <RelyingParty id="urn:mace:incommon" provider="http://example.org/IdP/InC"/>
-    
-    <MetadataProvider xmlns="urn:mace:shibboleth:2.0:metadata" xsi:type="HTTPMetadataProvider" id="incommon-metadata" metadataURL="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>
-                      
-    <security:TrustEngine xmlns:security="urn:mace:shibboleth:2.0:security" id="MetadataPKIXX509CredentialTrustEngine" xsi:type="security:MetadataPKIXX509Credential" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd" metadataProviderRef="incommon-metadata">
-        
-        <security:ValidationOptions xsi:type="security:CertPathValidationOptionsType" processEmptyCRLs="false" processExpiredCRLs="false" processCredentialCRLs="false" defaultVerificationDepth="3" forceRevocationEnabled="true" revocationEnabled="false"/> 
-        
-    </security:TrustEngine>
-    
-    <security:TrustEngine xmlns:security="urn:mace:shibboleth:2.0:security" id="MetadataPKIXSignatureTrustEngine" xsi:type="security:MetadataPKIXSignature" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd" metadataProviderRef="incommon-metadata">
-        
-        <security:ValidationOptions xsi:type="security:CertPathValidationOptionsType" processEmptyCRLs="false" processExpiredCRLs="false" processCredentialCRLs="false" defaultVerificationDepth="3" forceRevocationEnabled="true" revocationEnabled="false"/> 
-        
-    </security:TrustEngine>
-    
-</RelyingPartyGroup>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions1.xml.svn-base
deleted file mode 100644
index 6a4ca24..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions1.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions2.xml.svn-base
deleted file mode 100644
index 07b6a4f..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions2.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" xsi:type="security:ValidationOptionsType" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions3.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions3.xml.svn-base
deleted file mode 100644
index d510a35..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions3.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd" processEmptyCRLs="false" processExpiredCRLs="false" processCredentialCRLs="false" defaultVerificationDepth="3"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions4.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions4.xml.svn-base
deleted file mode 100644
index 3ac0fa2..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/PKIXValidationOptions4.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:ValidationOptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd" processEmptyCRLs="false" processExpiredCRLs="false" processCredentialCRLs="false" defaultVerificationDepth="3" badAttribute="foobar"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine-Options.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine-Options.xml.svn-base
deleted file mode 100644
index e6390f0..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine-Options.xml.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" id="StaticPKIXSignatureTrustEngine" xsi:type="security:StaticPKIXSignature" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd">
-    
-    <security:TrustedName>FOO</security:TrustedName>
-    <security:TrustedName>BAR</security:TrustedName>
-    <security:TrustedName>BAZ</security:TrustedName>
-    
-    <security:ValidationInfo id="InlinePKIXValidationInfo" xsi:type="security:PKIXInline" verifyDepth="5">
-        <security:Certificate>
-            -----BEGIN CERTIFICATE-----
-            MIIDnzCCAoegAwIBAgINSWITCHaai+Root+CAzANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJD
-            SDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5k
-            IEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFpIFJvb3QgQ0EwHhcNMDgwNTE1MDYzMDAwWhcN
-            MjgwNTE1MDYyOTU5WjBrMQswCQYDVQQGEwJDSDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9y
-            bWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5kIEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFp
-            IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUSWbn/rhWew/sLJRyciyR
-            KDGyFXSgiDO/EohYuZLw6EAKLLlhZorNtEHQbbn0Oo13S33MclHMvGWTKJM0u1hG+6gLy78EPmJb
-            qAE1Uv23wVEH4SX0VJfl3JVqIebiAH/CjuLubgMUspDIjOdQHNLS7pthTbm7Tgh7zMsiLPyMTZJe
-            p5CGbqv8NoK6bMaF0Z+Bt7e1JRlhHFCViJJaR/+hfpzLsJ8NWVivvrpRGaGJ1XR+9FGsTkjNdMCi
-            rNJJZ6XvUOe5w7pHSd9McppFP0eyLs02AMzMXI4iz6PK/w3EdzXGXpK+gSgvLxWYct4xHpv1e2NX
-            hNgdJOSN9ra/wJLVAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-            A1UdDgQWBBTpmuIGWOsP14EDXVyXubG1k307hDANBgkqhkiG9w0BAQUFAAOCAQEAMV/eIW6pFB+m
-            bk7rD7hUPTWDRaoca3kHqmFGFnHfuY8+c0/Mqjh8Y/jyX1ybf58crTSWrbyGbUZ3oxDGQ34tuZSk
-            meR32NqryiX3sP5qlNSozVguQKt8o4vhS1QeWPsXALs3em2pdKuIGSOpbuDnopPcmU2g5Zi2R5P7
-            qpKDKAKtNUEwV+LW7GBMEksONj7BFXk4AFBFBijaYJGgHmoKSImVgeNIvsV+BSv5HJ4q6vcxfnwu
-            vvGHM0AGphYO6f5qtHMUgvAblI8M/2QsBgethaGrirtKJ3aCRLdaR2R1QfaGRpck/Ron5/MpMxiJ
-            wLT8YlW/zjx2yNABhPSAjfzeMw==
-            -----END CERTIFICATE-----
-        </security:Certificate>
-    </security:ValidationInfo>
-    
-    <security:ValidationOptions xsi:type="security:CertPathValidationOptionsType" processEmptyCRLs="false" processExpiredCRLs="false" processCredentialCRLs="false" defaultVerificationDepth="3" forceRevocationEnabled="true" revocationEnabled="false"/> 
-    
-</security:TrustEngine>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine1.xml.svn-base
deleted file mode 100644
index 276e473..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine1.xml.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" id="StaticPKIXSignatureTrustEngine" xsi:type="security:StaticPKIXSignature" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd">
-    
-    <security:TrustedName>FOO</security:TrustedName>
-    <security:TrustedName>BAR</security:TrustedName>
-    <security:TrustedName>BAZ</security:TrustedName>
-    
-    <security:ValidationInfo id="InlinePKIXValidationInfo" xsi:type="security:PKIXInline" verifyDepth="5">
-        <security:Certificate>
-            -----BEGIN CERTIFICATE-----
-            MIIDnzCCAoegAwIBAgINSWITCHaai+Root+CAzANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJD
-            SDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5k
-            IEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFpIFJvb3QgQ0EwHhcNMDgwNTE1MDYzMDAwWhcN
-            MjgwNTE1MDYyOTU5WjBrMQswCQYDVQQGEwJDSDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9y
-            bWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5kIEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFp
-            IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUSWbn/rhWew/sLJRyciyR
-            KDGyFXSgiDO/EohYuZLw6EAKLLlhZorNtEHQbbn0Oo13S33MclHMvGWTKJM0u1hG+6gLy78EPmJb
-            qAE1Uv23wVEH4SX0VJfl3JVqIebiAH/CjuLubgMUspDIjOdQHNLS7pthTbm7Tgh7zMsiLPyMTZJe
-            p5CGbqv8NoK6bMaF0Z+Bt7e1JRlhHFCViJJaR/+hfpzLsJ8NWVivvrpRGaGJ1XR+9FGsTkjNdMCi
-            rNJJZ6XvUOe5w7pHSd9McppFP0eyLs02AMzMXI4iz6PK/w3EdzXGXpK+gSgvLxWYct4xHpv1e2NX
-            hNgdJOSN9ra/wJLVAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-            A1UdDgQWBBTpmuIGWOsP14EDXVyXubG1k307hDANBgkqhkiG9w0BAQUFAAOCAQEAMV/eIW6pFB+m
-            bk7rD7hUPTWDRaoca3kHqmFGFnHfuY8+c0/Mqjh8Y/jyX1ybf58crTSWrbyGbUZ3oxDGQ34tuZSk
-            meR32NqryiX3sP5qlNSozVguQKt8o4vhS1QeWPsXALs3em2pdKuIGSOpbuDnopPcmU2g5Zi2R5P7
-            qpKDKAKtNUEwV+LW7GBMEksONj7BFXk4AFBFBijaYJGgHmoKSImVgeNIvsV+BSv5HJ4q6vcxfnwu
-            vvGHM0AGphYO6f5qtHMUgvAblI8M/2QsBgethaGrirtKJ3aCRLdaR2R1QfaGRpck/Ron5/MpMxiJ
-            wLT8YlW/zjx2yNABhPSAjfzeMw==
-            -----END CERTIFICATE-----
-        </security:Certificate>
-    </security:ValidationInfo>
-    
-</security:TrustEngine>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine2.xml.svn-base
deleted file mode 100644
index 9cd1000..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXSignatureTrustEngine2.xml.svn-base
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" id="StaticPKIXSignatureTrustEngine" xsi:type="security:StaticPKIXSignature" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd">
-    
-    <security:TrustedName>FOO</security:TrustedName>
-    <security:TrustedName>BAR</security:TrustedName>
-    <security:TrustedName>BAZ</security:TrustedName>
-    
-    <security:ValidationInfo id="InlinePKIXValidationInfo" xsi:type="security:PKIXInline" verifyDepth="5">
-    </security:ValidationInfo>
-    
-</security:TrustEngine>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine-Options.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine-Options.xml.svn-base
deleted file mode 100644
index 94c7016..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine-Options.xml.svn-base
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" id="StaticPKIXX509CredentialTrustEngine" xsi:type="security:StaticPKIXX509Credential" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd">
-    
-    <security:TrustedName>FOO</security:TrustedName>
-    <security:TrustedName>BAR</security:TrustedName>
-    <security:TrustedName>BAZ</security:TrustedName>
-    
-    <security:ValidationInfo id="InlinePKIXValidationInfo" xsi:type="security:PKIXInline" verifyDepth="5">
-        <security:Certificate>
-            -----BEGIN CERTIFICATE-----
-            MIIDnzCCAoegAwIBAgINSWITCHaai+Root+CAzANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJD
-            SDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5k
-            IEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFpIFJvb3QgQ0EwHhcNMDgwNTE1MDYzMDAwWhcN
-            MjgwNTE1MDYyOTU5WjBrMQswCQYDVQQGEwJDSDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9y
-            bWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5kIEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFp
-            IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUSWbn/rhWew/sLJRyciyR
-            KDGyFXSgiDO/EohYuZLw6EAKLLlhZorNtEHQbbn0Oo13S33MclHMvGWTKJM0u1hG+6gLy78EPmJb
-            qAE1Uv23wVEH4SX0VJfl3JVqIebiAH/CjuLubgMUspDIjOdQHNLS7pthTbm7Tgh7zMsiLPyMTZJe
-            p5CGbqv8NoK6bMaF0Z+Bt7e1JRlhHFCViJJaR/+hfpzLsJ8NWVivvrpRGaGJ1XR+9FGsTkjNdMCi
-            rNJJZ6XvUOe5w7pHSd9McppFP0eyLs02AMzMXI4iz6PK/w3EdzXGXpK+gSgvLxWYct4xHpv1e2NX
-            hNgdJOSN9ra/wJLVAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-            A1UdDgQWBBTpmuIGWOsP14EDXVyXubG1k307hDANBgkqhkiG9w0BAQUFAAOCAQEAMV/eIW6pFB+m
-            bk7rD7hUPTWDRaoca3kHqmFGFnHfuY8+c0/Mqjh8Y/jyX1ybf58crTSWrbyGbUZ3oxDGQ34tuZSk
-            meR32NqryiX3sP5qlNSozVguQKt8o4vhS1QeWPsXALs3em2pdKuIGSOpbuDnopPcmU2g5Zi2R5P7
-            qpKDKAKtNUEwV+LW7GBMEksONj7BFXk4AFBFBijaYJGgHmoKSImVgeNIvsV+BSv5HJ4q6vcxfnwu
-            vvGHM0AGphYO6f5qtHMUgvAblI8M/2QsBgethaGrirtKJ3aCRLdaR2R1QfaGRpck/Ron5/MpMxiJ
-            wLT8YlW/zjx2yNABhPSAjfzeMw==
-            -----END CERTIFICATE-----
-        </security:Certificate>
-    </security:ValidationInfo>
-    
-    <security:ValidationOptions xsi:type="security:CertPathValidationOptionsType" processEmptyCRLs="false" processExpiredCRLs="false" processCredentialCRLs="false" defaultVerificationDepth="3" forceRevocationEnabled="true" revocationEnabled="false"/> 
-    
-</security:TrustEngine>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine1.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine1.xml.svn-base
deleted file mode 100644
index 3e44cf0..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine1.xml.svn-base
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" id="StaticPKIXX509CredentialTrustEngine" xsi:type="security:StaticPKIXX509Credential" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd">
-    
-    <security:TrustedName>FOO</security:TrustedName>
-    <security:TrustedName>BAR</security:TrustedName>
-    <security:TrustedName>BAZ</security:TrustedName>
-    
-    <security:ValidationInfo id="InlinePKIXValidationInfo" xsi:type="security:PKIXInline" verifyDepth="5">
-        <security:Certificate>
-            -----BEGIN CERTIFICATE-----
-            MIIDnzCCAoegAwIBAgINSWITCHaai+Root+CAzANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJD
-            SDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9ybWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5k
-            IEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFpIFJvb3QgQ0EwHhcNMDgwNTE1MDYzMDAwWhcN
-            MjgwNTE1MDYyOTU5WjBrMQswCQYDVQQGEwJDSDFAMD4GA1UEChM3U3dpdGNoIC0gVGVsZWluZm9y
-            bWF0aWtkaWVuc3RlIGZ1ZXIgTGVocmUgdW5kIEZvcnNjaHVuZzEaMBgGA1UEAxMRU1dJVENIYWFp
-            IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUSWbn/rhWew/sLJRyciyR
-            KDGyFXSgiDO/EohYuZLw6EAKLLlhZorNtEHQbbn0Oo13S33MclHMvGWTKJM0u1hG+6gLy78EPmJb
-            qAE1Uv23wVEH4SX0VJfl3JVqIebiAH/CjuLubgMUspDIjOdQHNLS7pthTbm7Tgh7zMsiLPyMTZJe
-            p5CGbqv8NoK6bMaF0Z+Bt7e1JRlhHFCViJJaR/+hfpzLsJ8NWVivvrpRGaGJ1XR+9FGsTkjNdMCi
-            rNJJZ6XvUOe5w7pHSd9McppFP0eyLs02AMzMXI4iz6PK/w3EdzXGXpK+gSgvLxWYct4xHpv1e2NX
-            hNgdJOSN9ra/wJLVAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-            A1UdDgQWBBTpmuIGWOsP14EDXVyXubG1k307hDANBgkqhkiG9w0BAQUFAAOCAQEAMV/eIW6pFB+m
-            bk7rD7hUPTWDRaoca3kHqmFGFnHfuY8+c0/Mqjh8Y/jyX1ybf58crTSWrbyGbUZ3oxDGQ34tuZSk
-            meR32NqryiX3sP5qlNSozVguQKt8o4vhS1QeWPsXALs3em2pdKuIGSOpbuDnopPcmU2g5Zi2R5P7
-            qpKDKAKtNUEwV+LW7GBMEksONj7BFXk4AFBFBijaYJGgHmoKSImVgeNIvsV+BSv5HJ4q6vcxfnwu
-            vvGHM0AGphYO6f5qtHMUgvAblI8M/2QsBgethaGrirtKJ3aCRLdaR2R1QfaGRpck/Ron5/MpMxiJ
-            wLT8YlW/zjx2yNABhPSAjfzeMw==
-            -----END CERTIFICATE-----
-        </security:Certificate>
-    </security:ValidationInfo>
-    
-</security:TrustEngine>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine2.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine2.xml.svn-base
deleted file mode 100644
index da11019..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/config/security/.svn/text-base/StaticPKIXX509CredentialTrustEngine2.xml.svn-base
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="urn:mace:shibboleth:2.0:security" id="StaticPKIXX509CredentialTrustEngine" xsi:type="security:StaticPKIXX509Credential" xsi:schemaLocation="urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd">
-    
-    <security:TrustedName>FOO</security:TrustedName>
-    <security:TrustedName>BAR</security:TrustedName>
-    <security:TrustedName>BAZ</security:TrustedName>
-    
-    <security:ValidationInfo id="InlinePKIXValidationInfo" xsi:type="security:PKIXInline" verifyDepth="5">
-    </security:ValidationInfo>
-    
-</security:TrustEngine>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops
deleted file mode 100644
index b7b7120..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/all-wcprops
+++ /dev/null
@@ -1,59 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 121
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security
-END
-names-entities-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 154
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/names-entities-metadata-pkix.xml
-END
-oneset-entity-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 153
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/oneset-entity-metadata-pkix.xml
-END
-twoset-2authorities-entities-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/twoset-2authorities-entities-metadata-pkix.xml
-END
-empty-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 145
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/empty-metadata-pkix.xml
-END
-oneset-entities-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/oneset-entities-metadata-pkix.xml
-END
-threeset-entity-entities-entities-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 173
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/threeset-entity-entities-entities-metadata-pkix.xml
-END
-twoset-entity-entities-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 162
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/twoset-entity-entities-metadata-pkix.xml
-END
-oneset-3keyinfo-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 155
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/oneset-3keyinfo-metadata-pkix.xml
-END
-nodepth-entities-metadata-pkix.xml
-K 25
-svn:wc:ra_dav:version-url
-V 156
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/nodepth-entities-metadata-pkix.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/entries
deleted file mode 100644
index 6dd389e..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/entries
+++ /dev/null
@@ -1,334 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-names-entities-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.826740Z
-1717d3a93d48775b33731e325dc58ad4
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8723
-

-oneset-entity-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.826740Z
-335baead6899ea6e9dd4bf2d4e4f501c
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9093
-

-twoset-2authorities-entities-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.826740Z
-50acf86fe0f8777508cdbc08c69a96f9
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11753
-

-empty-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.822740Z
-6e3ddd6d8a6a142f3ecefb585a077596
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2631
-

-oneset-entities-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.822740Z
-21ccbd710e84d53d1e0e315bd88a5873
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8810
-

-threeset-entity-entities-entities-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.822740Z
-4db22afebca501dfda713fc36b009d9e
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-19376
-

-twoset-entity-entities-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.822740Z
-60ddab57fc8b155cdb0b8249a2fc3b57
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-17402
-

-oneset-3keyinfo-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.826740Z
-ac0be4164477c2654c8c4aa951ed79e3
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-17001
-

-nodepth-entities-metadata-pkix.xml
-file
-
-
-
-
-2014-02-19T17:27:40.826740Z
-99717f8c0ddddbca62a3daa5507cd02c
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8835
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/empty-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/empty-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/empty-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/names-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/names-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/names-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/nodepth-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/nodepth-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/nodepth-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-3keyinfo-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-3keyinfo-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-3keyinfo-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-entity-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-entity-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/oneset-entity-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/threeset-entity-entities-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/threeset-entity-entities-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/threeset-entity-entities-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/twoset-2authorities-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/twoset-2authorities-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/twoset-2authorities-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/twoset-entity-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/twoset-entity-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/prop-base/twoset-entity-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/empty-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/empty-metadata-pkix.xml.svn-base
deleted file mode 100644
index 413307f..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/empty-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/names-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/names-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index fc2f015..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/names-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-               <ds:KeyName>idp.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         
-         <!-- No Key Descriptor with trusted names -->
-         
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/nodepth-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/nodepth-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index ab2bfaa..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/nodepth-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <!-- No verify depth specified -->
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-3keyinfo-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-3keyinfo-metadata-pkix.xml.svn-base
deleted file mode 100644
index b1759b8..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-3keyinfo-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 2 issues Intermediate CA 2A -->
-            <!-- Root CA 2 issues Intermediate CA 2B -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 2 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDc1NloX
-                  DTMzMDIwOTAyNDc1NlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBx
-                  1TBIAI+/C1z/UGpEEbCV6F+qhyTM9k2qLeVoqS+ZkSCW3rGpJEx3W3cdUClYsiZq
-                  X67OsJ6Yg1ilHmQHOwGO+6da2fJx4fSbNdzcJAUH2Zge4PYufTeE23Z6e8FMakIi
-                  27NElWsY1AdP0TEyXFJHYOhpJwMzs1kMkhBetOMXfgny0GRhK6tfmNlBI7iHTRTP
-                  5RnakeKauomoVx5t+XrHQPaRCzjvRRxgLJ66UDNe48xztbz4lAz1N1yFL5ONIsIj
-                  wds6aOTj6Akt7rha+cozTbpHMWdPvOTiKydpAzabN1y1998geseLLwtDd6RsrHKk
-                  jIjqn1KTMb85zHffoyUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFPdjZ6zd62bP
-                  OJ5E2KKIh7FL3GFSMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKIh7FL3GFSoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAy
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQB/4RsB7RzvmDualEaF9Fpgr/pJIa4/TkG/
-                  /WQlKtQL4dA1NH2cA12ET2UiiSA3wwedXqaJ3xR1e5j2d2u30DhsYDBqQT+vWWA0
-                  Z3tJET4n0lIuCozn3b1xNIqTX1/BxeDTuoqz5HVT66mwMPtT8UDTcD8h0jmrW+LU
-                  9aQX4zSYyPaiq0Dvu7dnnrhqAWJ1o2+Bet6YmtfxMUXXSolwC6ZBcWzq6ighXsyw
-                  dh9v+60iczDPvXZq0aLNgYoSmVXNXIj8/gZEDBUY3r2u3FEWVR62XC0wKDTiTe2M
-                  ixmfwIdPq/WshU0tUGqnhTN9x2dCQGJuS1EhTPM2AbBZydZ4ygTE
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDgzOVoX
-                  DTI4MDIxMTAyNDgzOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBANeowIrfgyqAOwSQmU2nf+LwlKrse3d+wpTTIVE+NTOFAT9YHIzP4I9i
-                  axt+63JnLkS3TgxADR/bhoz0qdSeKkba+7/3ZYLNqpdoH0j0HUstKYslDFeElKle
-                  sPcmQAzcwH9k2dwrlLIZZ0jX3/NzK4HgVn8AwYhkCzW0z4cmW25+1dGOteSWm5oF
-                  sot0sGxm+2F4Tt1UbNvYV7uB65dvajqoY0o2gwZLh61wF/A8ADM9qMPX1lW5PgUI
-                  tx/J5MP+FnEEsQi94wnrS8oAldU6Qb6Wv6PwE/YaTUn3m0wp7SWLrlgLLvF4Useb
-                  r2V+Ab0XUz+wRMz9GJvhmxW2Aoz4LhUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FHoQVd5JyBpssooxI+gZFAfkDdOgMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBYAoFyRZmZJY/nFzfaKFmM
-                  dGD/ex5n3exFoDjKoiShuAU3ReXnFR+AVz9f7FlHqsnWAp0pGMmJ8NrqXpJaO6SC
-                  RBHVPagBAdyoNGK4anjwLTiCKCAVi5MBnGpeis07nfy4Ot1dvl++w/3YgIouABTi
-                  5hyy3bgzFNoS/vwas1k7NJacjZiRTT+3MDJ9OtjHGdZN7/tXQL3vujEGp6+z1Ly7
-                  c1uOIARdlN44Jk9OR7SWaAi0v9bh2i1iw/3wPDjSz1srosxV2ANIonOKfQryxREh
-                  TgEK3IHfc0VGcKPsZ0oljH29/dMoHiYQy4Su8uqjd4n8l2YxGKPXhf4PVO0Go1Ot
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDg1N1oX
-                  DTI4MDIxMTAyNDg1N1owNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALgYSfCvdNqEzs7048Tovc9LgyIrDwuBkoU2HbdczIuw8ipJDAOmo5w3
-                  BIDjxUZQx2vO1v6KW81AcOR0LqXd0K8Bnl5OXFHiW3laz9yFhyXKAB5roWnrQmCL
-                  vitN6P3vM6AA2UiNT1Ze9utFQ1SwnDfPDVYTRebhbxRgj5qWOK2mB9OIoD2ff0pI
-                  gf1ziIiJHChljnd2UA3OM/5pI5sKd0iaT6SrhGzysgn1ITTeWlw1axOfyh/+SW8k
-                  yefZQkjWLXce/9DcHDdo3NSDbqX264VQK0QcQi7l2v5HNEecSRecelO0746bjJ7n
-                  mbcQvEkdxgfvZBvqIqB4Drd75yPmcd0CAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FP0txMEysaCUdvSu+xU1DV7eNPOuMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQCBtGF7Hls4x7xbM8dRYp4g
-                  RG0UsRVwRne+Yozzk/sn38rJni6qhMbEwpd0nLp2hwVi2++knQ/ZG5iAxMNCTkP/
-                  /k1fO4ezglUnlLWzJZb0L7mSulpcFHQ2wiOxPjNTVX/kD+y5FzfmGA31CH3CYDwk
-                  itDI+5TRcpvYYU4YS+thVMdPFqRlS7JkylrF1k4vAdPNCSkzk1RCjTIHqPXGSB1N
-                  JmK5VijeplrmJr9LwxhR9D1/dbth+k4RIZ0/ARRuxBMTCLQcsJ/qdrw3a1qlGi21
-                  0LjfQiBmLW7w5OWjhbK+Y8IAgm9zjswRQHZ5z2sSOf7sw8JviTyVDvlAlQ3XPEbW
-               </ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 3 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                  DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                  aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                  Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                  7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                  AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                  EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                  VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                  Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                  LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                  q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                  xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                  FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                  qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-               </ds:X509Certificate>
-               <!-- CRL (version 2) issued by Root CA 3 -->
-               <ds:X509CRL>
-                  MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                  FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                  NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                  LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                  ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                  6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                  cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                  5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                  hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                  WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index bc1b30a..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-entity-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-entity-metadata-pkix.xml.svn-base
deleted file mode 100644
index 30074e6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/oneset-entity-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      
-      <Extensions>
-         
-         <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <!-- Root CA 1 issues Intermediate CA 1A -->
-               <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-               <ds:X509Data>
-                  <!-- O=Internet2, CN=Test Root CA 1 --> 
-                  <ds:X509Certificate>
-                     MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                     cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                     DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                     ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                     6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                     IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                     659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                     yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                     THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                     4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                     SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                     bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                     LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                     ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                     Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                     INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                     K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                     /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                     V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                  </ds:X509Certificate>
-                  <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-                  <ds:X509Certificate>
-                     MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                     cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                     DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                     ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                     AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                     pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                     o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                     3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                     i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                     8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                     AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                     FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                     nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                     Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                     pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                     aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                     c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                     Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                     NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-                  </ds:X509Certificate>
-                  <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-                  <ds:X509Certificate>
-                     MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                     cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                     NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                     HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                     AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                     DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                     WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                     2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                     Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                     pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                     VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                     MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                     Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                     VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                     IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                     d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                     12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                     9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                     EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                     L9VaYDF1sVm6pw==
-                  </ds:X509Certificate>
-                  <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-                  <ds:X509CRL>
-                     MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                     A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                     NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                     AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                     GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                     C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                     +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                     CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                     62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-                  </ds:X509CRL>
-               </ds:X509Data>
-            </ds:KeyInfo>
-         </shibmd:KeyAuthority>
-         
-      </Extensions>
-      
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/threeset-entity-entities-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/threeset-entity-entities-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 82e3856..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/threeset-entity-entities-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="http://the.federation.com">
-   
-   <Extensions>
-   
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcyOVoX
-                  DTI4MDIxMTAyNDcyOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBAMFmeuJN8TNCmZf5qRUXb0nIOLdoEhReG3O4dTO7V10eKdUmI3ED4qn2
-                  dJ43lFDN09FI0792GrEJB9rWFq09xoaBuLulTQmEJFmeR2jkNmAoJJ9X6UjzHjsZ
-                  oF1M/PVMDgMX/5NxcLtAtnAOsiaKU7WdiGrvgd8rpdUBh7OMqv68tA3Atn7bn37l
-                  g2EHBkG4eS0mN4bGT2XTfP8Ft1q1INpGa+PTJWAAvqL1gF4S+9r+fg9iSW9YMTlQ
-                  0GbkXGvSEN1LePmx0+Spp56eQj+nASClXcmMCOeGJ2YKRPDQ7DmW6yDbbXtb4AL0
-                  lp1p9zw0iGO7CpEePHoqiV/abCGfEwECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FEBLOJgprnb55vlDuKKL1N+TGFzGMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQAtkDIR1wUCL7icVAInaNEE
-                  qo1yA3fW6yWa68mhO2QU1NDKDrmVYu5Vxn0ilDUbdDkhOz8OhIIdQkWR0V/PBYpq
-                  oMD+9LtqURypV8HgLP5t/mh7tpQBcj1/9fO0ARDFNgBouSQAXI0oQ3/yBOPCvhRG
-                  yxrYMUTnX11GFnkkzawWEMNGja4FfHybcFhaPrVN0Bt/ycdI8GEChSk+8nudpmYj
-                  gawp0eagQq4XoHS9Bfi1+v7n5WenyCCdvMFc8RvV8OkviaO8Bautmw3YR3pXD8VX
-                  cCCviIhkqf1Hr7Kmcdwa7w5Fq+ruWA+ZpO6JpSjzM5MCl9VQH7GiY+45cgEhRNGL
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-   
-   </Extensions>
-   
-<EntitiesDescriptor Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 2 issues Intermediate CA 2A -->
-            <!-- Root CA 2 issues Intermediate CA 2B -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 2 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDc1NloX
-                  DTMzMDIwOTAyNDc1NlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBx
-                  1TBIAI+/C1z/UGpEEbCV6F+qhyTM9k2qLeVoqS+ZkSCW3rGpJEx3W3cdUClYsiZq
-                  X67OsJ6Yg1ilHmQHOwGO+6da2fJx4fSbNdzcJAUH2Zge4PYufTeE23Z6e8FMakIi
-                  27NElWsY1AdP0TEyXFJHYOhpJwMzs1kMkhBetOMXfgny0GRhK6tfmNlBI7iHTRTP
-                  5RnakeKauomoVx5t+XrHQPaRCzjvRRxgLJ66UDNe48xztbz4lAz1N1yFL5ONIsIj
-                  wds6aOTj6Akt7rha+cozTbpHMWdPvOTiKydpAzabN1y1998geseLLwtDd6RsrHKk
-                  jIjqn1KTMb85zHffoyUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFPdjZ6zd62bP
-                  OJ5E2KKIh7FL3GFSMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKIh7FL3GFSoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAy
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQB/4RsB7RzvmDualEaF9Fpgr/pJIa4/TkG/
-                  /WQlKtQL4dA1NH2cA12ET2UiiSA3wwedXqaJ3xR1e5j2d2u30DhsYDBqQT+vWWA0
-                  Z3tJET4n0lIuCozn3b1xNIqTX1/BxeDTuoqz5HVT66mwMPtT8UDTcD8h0jmrW+LU
-                  9aQX4zSYyPaiq0Dvu7dnnrhqAWJ1o2+Bet6YmtfxMUXXSolwC6ZBcWzq6ighXsyw
-                  dh9v+60iczDPvXZq0aLNgYoSmVXNXIj8/gZEDBUY3r2u3FEWVR62XC0wKDTiTe2M
-                  ixmfwIdPq/WshU0tUGqnhTN9x2dCQGJuS1EhTPM2AbBZydZ4ygTE
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDgzOVoX
-                  DTI4MDIxMTAyNDgzOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBANeowIrfgyqAOwSQmU2nf+LwlKrse3d+wpTTIVE+NTOFAT9YHIzP4I9i
-                  axt+63JnLkS3TgxADR/bhoz0qdSeKkba+7/3ZYLNqpdoH0j0HUstKYslDFeElKle
-                  sPcmQAzcwH9k2dwrlLIZZ0jX3/NzK4HgVn8AwYhkCzW0z4cmW25+1dGOteSWm5oF
-                  sot0sGxm+2F4Tt1UbNvYV7uB65dvajqoY0o2gwZLh61wF/A8ADM9qMPX1lW5PgUI
-                  tx/J5MP+FnEEsQi94wnrS8oAldU6Qb6Wv6PwE/YaTUn3m0wp7SWLrlgLLvF4Useb
-                  r2V+Ab0XUz+wRMz9GJvhmxW2Aoz4LhUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FHoQVd5JyBpssooxI+gZFAfkDdOgMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBYAoFyRZmZJY/nFzfaKFmM
-                  dGD/ex5n3exFoDjKoiShuAU3ReXnFR+AVz9f7FlHqsnWAp0pGMmJ8NrqXpJaO6SC
-                  RBHVPagBAdyoNGK4anjwLTiCKCAVi5MBnGpeis07nfy4Ot1dvl++w/3YgIouABTi
-                  5hyy3bgzFNoS/vwas1k7NJacjZiRTT+3MDJ9OtjHGdZN7/tXQL3vujEGp6+z1Ly7
-                  c1uOIARdlN44Jk9OR7SWaAi0v9bh2i1iw/3wPDjSz1srosxV2ANIonOKfQryxREh
-                  TgEK3IHfc0VGcKPsZ0oljH29/dMoHiYQy4Su8uqjd4n8l2YxGKPXhf4PVO0Go1Ot
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDg1N1oX
-                  DTI4MDIxMTAyNDg1N1owNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALgYSfCvdNqEzs7048Tovc9LgyIrDwuBkoU2HbdczIuw8ipJDAOmo5w3
-                  BIDjxUZQx2vO1v6KW81AcOR0LqXd0K8Bnl5OXFHiW3laz9yFhyXKAB5roWnrQmCL
-                  vitN6P3vM6AA2UiNT1Ze9utFQ1SwnDfPDVYTRebhbxRgj5qWOK2mB9OIoD2ff0pI
-                  gf1ziIiJHChljnd2UA3OM/5pI5sKd0iaT6SrhGzysgn1ITTeWlw1axOfyh/+SW8k
-                  yefZQkjWLXce/9DcHDdo3NSDbqX264VQK0QcQi7l2v5HNEecSRecelO0746bjJ7n
-                  mbcQvEkdxgfvZBvqIqB4Drd75yPmcd0CAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FP0txMEysaCUdvSu+xU1DV7eNPOuMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQCBtGF7Hls4x7xbM8dRYp4g
-                  RG0UsRVwRne+Yozzk/sn38rJni6qhMbEwpd0nLp2hwVi2++knQ/ZG5iAxMNCTkP/
-                  /k1fO4ezglUnlLWzJZb0L7mSulpcFHQ2wiOxPjNTVX/kD+y5FzfmGA31CH3CYDwk
-                  itDI+5TRcpvYYU4YS+thVMdPFqRlS7JkylrF1k4vAdPNCSkzk1RCjTIHqPXGSB1N
-                  JmK5VijeplrmJr9LwxhR9D1/dbth+k4RIZ0/ARRuxBMTCLQcsJ/qdrw3a1qlGi21
-                  0LjfQiBmLW7w5OWjhbK+Y8IAgm9zjswRQHZ5z2sSOf7sw8JviTyVDvlAlQ3XPEbW
-               </ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      
-      <Extensions>
-         <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="3">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                  <ds:X509Data>
-                     <!-- O=Internet2, CN=Test Root CA 3 -->
-                     <ds:X509Certificate>
-                        MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                        cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                        DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                        ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                        aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                        Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                        7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                        AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                        EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                        VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                        SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                        Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                        LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                        ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                        LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                        q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                        xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                        FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                        qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-                     </ds:X509Certificate>
-                     <!-- CRL (version 2) issued by Root CA 3 -->
-                     <ds:X509CRL>
-                        MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                        FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                        NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                        LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                        ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                        6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                        cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                        5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                        hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                        WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-                     </ds:X509CRL>
-                  </ds:X509Data>
-               </ds:KeyInfo>
-         </shibmd:KeyAuthority>
-      </Extensions>
-      
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
-   
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/twoset-2authorities-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/twoset-2authorities-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 35f6c73..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/twoset-2authorities-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-         
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="3">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 3 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                  DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                  aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                  Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                  7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                  AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                  EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                  VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                  Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                  LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                  q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                  xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                  FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                  qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-               </ds:X509Certificate>
-               <!-- CRL (version 2) issued by Root CA 3 -->
-               <ds:X509CRL>
-                  MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                  FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                  NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                  LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                  ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                  6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                  cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                  5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                  hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                  WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/twoset-entity-entities-metadata-pkix.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/twoset-entity-entities-metadata-pkix.xml.svn-base
deleted file mode 100644
index 7b09f2e..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/security/.svn/text-base/twoset-entity-entities-metadata-pkix.xml.svn-base
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 2 issues Intermediate CA 2A -->
-            <!-- Root CA 2 issues Intermediate CA 2B -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 2 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDc1NloX
-                  DTMzMDIwOTAyNDc1NlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBx
-                  1TBIAI+/C1z/UGpEEbCV6F+qhyTM9k2qLeVoqS+ZkSCW3rGpJEx3W3cdUClYsiZq
-                  X67OsJ6Yg1ilHmQHOwGO+6da2fJx4fSbNdzcJAUH2Zge4PYufTeE23Z6e8FMakIi
-                  27NElWsY1AdP0TEyXFJHYOhpJwMzs1kMkhBetOMXfgny0GRhK6tfmNlBI7iHTRTP
-                  5RnakeKauomoVx5t+XrHQPaRCzjvRRxgLJ66UDNe48xztbz4lAz1N1yFL5ONIsIj
-                  wds6aOTj6Akt7rha+cozTbpHMWdPvOTiKydpAzabN1y1998geseLLwtDd6RsrHKk
-                  jIjqn1KTMb85zHffoyUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFPdjZ6zd62bP
-                  OJ5E2KKIh7FL3GFSMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKIh7FL3GFSoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAy
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQB/4RsB7RzvmDualEaF9Fpgr/pJIa4/TkG/
-                  /WQlKtQL4dA1NH2cA12ET2UiiSA3wwedXqaJ3xR1e5j2d2u30DhsYDBqQT+vWWA0
-                  Z3tJET4n0lIuCozn3b1xNIqTX1/BxeDTuoqz5HVT66mwMPtT8UDTcD8h0jmrW+LU
-                  9aQX4zSYyPaiq0Dvu7dnnrhqAWJ1o2+Bet6YmtfxMUXXSolwC6ZBcWzq6ighXsyw
-                  dh9v+60iczDPvXZq0aLNgYoSmVXNXIj8/gZEDBUY3r2u3FEWVR62XC0wKDTiTe2M
-                  ixmfwIdPq/WshU0tUGqnhTN9x2dCQGJuS1EhTPM2AbBZydZ4ygTE
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDgzOVoX
-                  DTI4MDIxMTAyNDgzOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBANeowIrfgyqAOwSQmU2nf+LwlKrse3d+wpTTIVE+NTOFAT9YHIzP4I9i
-                  axt+63JnLkS3TgxADR/bhoz0qdSeKkba+7/3ZYLNqpdoH0j0HUstKYslDFeElKle
-                  sPcmQAzcwH9k2dwrlLIZZ0jX3/NzK4HgVn8AwYhkCzW0z4cmW25+1dGOteSWm5oF
-                  sot0sGxm+2F4Tt1UbNvYV7uB65dvajqoY0o2gwZLh61wF/A8ADM9qMPX1lW5PgUI
-                  tx/J5MP+FnEEsQi94wnrS8oAldU6Qb6Wv6PwE/YaTUn3m0wp7SWLrlgLLvF4Useb
-                  r2V+Ab0XUz+wRMz9GJvhmxW2Aoz4LhUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FHoQVd5JyBpssooxI+gZFAfkDdOgMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBYAoFyRZmZJY/nFzfaKFmM
-                  dGD/ex5n3exFoDjKoiShuAU3ReXnFR+AVz9f7FlHqsnWAp0pGMmJ8NrqXpJaO6SC
-                  RBHVPagBAdyoNGK4anjwLTiCKCAVi5MBnGpeis07nfy4Ot1dvl++w/3YgIouABTi
-                  5hyy3bgzFNoS/vwas1k7NJacjZiRTT+3MDJ9OtjHGdZN7/tXQL3vujEGp6+z1Ly7
-                  c1uOIARdlN44Jk9OR7SWaAi0v9bh2i1iw/3wPDjSz1srosxV2ANIonOKfQryxREh
-                  TgEK3IHfc0VGcKPsZ0oljH29/dMoHiYQy4Su8uqjd4n8l2YxGKPXhf4PVO0Go1Ot
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDg1N1oX
-                  DTI4MDIxMTAyNDg1N1owNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALgYSfCvdNqEzs7048Tovc9LgyIrDwuBkoU2HbdczIuw8ipJDAOmo5w3
-                  BIDjxUZQx2vO1v6KW81AcOR0LqXd0K8Bnl5OXFHiW3laz9yFhyXKAB5roWnrQmCL
-                  vitN6P3vM6AA2UiNT1Ze9utFQ1SwnDfPDVYTRebhbxRgj5qWOK2mB9OIoD2ff0pI
-                  gf1ziIiJHChljnd2UA3OM/5pI5sKd0iaT6SrhGzysgn1ITTeWlw1axOfyh/+SW8k
-                  yefZQkjWLXce/9DcHDdo3NSDbqX264VQK0QcQi7l2v5HNEecSRecelO0746bjJ7n
-                  mbcQvEkdxgfvZBvqIqB4Drd75yPmcd0CAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FP0txMEysaCUdvSu+xU1DV7eNPOuMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQCBtGF7Hls4x7xbM8dRYp4g
-                  RG0UsRVwRne+Yozzk/sn38rJni6qhMbEwpd0nLp2hwVi2++knQ/ZG5iAxMNCTkP/
-                  /k1fO4ezglUnlLWzJZb0L7mSulpcFHQ2wiOxPjNTVX/kD+y5FzfmGA31CH3CYDwk
-                  itDI+5TRcpvYYU4YS+thVMdPFqRlS7JkylrF1k4vAdPNCSkzk1RCjTIHqPXGSB1N
-                  JmK5VijeplrmJr9LwxhR9D1/dbth+k4RIZ0/ARRuxBMTCLQcsJ/qdrw3a1qlGi21
-                  0LjfQiBmLW7w5OWjhbK+Y8IAgm9zjswRQHZ5z2sSOf7sw8JviTyVDvlAlQ3XPEbW
-               </ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      
-      <Extensions>
-         <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="3">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                  <ds:X509Data>
-                     <!-- O=Internet2, CN=Test Root CA 3 -->
-                     <ds:X509Certificate>
-                        MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                        cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                        DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                        ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                        aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                        Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                        7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                        AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                        EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                        VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                        SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                        Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                        LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                        ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                        LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                        q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                        xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                        FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                        qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-                     </ds:X509Certificate>
-                     <!-- CRL (version 2) issued by Root CA 3 -->
-                     <ds:X509CRL>
-                        MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                        FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                        NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                        LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                        ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                        6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                        cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                        5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                        hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                        WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-                     </ds:X509CRL>
-                  </ds:X509Data>
-               </ds:KeyInfo>
-         </shibmd:KeyAuthority>
-      </Extensions>
-      
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>> </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops
deleted file mode 100644
index 3cd3807..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/all-wcprops
+++ /dev/null
@@ -1,5 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 122
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries
deleted file mode 100644
index fa85267..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/.svn/entries
+++ /dev/null
@@ -1,31 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-impl
-dir
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops
deleted file mode 100644
index 1c4d0e7..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/all-wcprops
+++ /dev/null
@@ -1,47 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 127
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl
-END
-ShibMDScope.xml
-K 25
-svn:wc:ra_dav:version-url
-V 143
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibMDScope.xml
-END
-ShibScopedValue.xml
-K 25
-svn:wc:ra_dav:version-url
-V 147
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibScopedValue.xml
-END
-ShibMDKeyAuthorityOptionalAttributes.xml
-K 25
-svn:wc:ra_dav:version-url
-V 168
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibMDKeyAuthorityOptionalAttributes.xml
-END
-ShibMDKeyAuthority.xml
-K 25
-svn:wc:ra_dav:version-url
-V 150
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibMDKeyAuthority.xml
-END
-ShibMDKeyAuthorityChildElements.xml
-K 25
-svn:wc:ra_dav:version-url
-V 163
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibMDKeyAuthorityChildElements.xml
-END
-ShibMDScopeOptionalAttributes.xml
-K 25
-svn:wc:ra_dav:version-url
-V 161
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibMDScopeOptionalAttributes.xml
-END
-ShibScopedValueOptionalAttributes.xml
-K 25
-svn:wc:ra_dav:version-url
-V 165
-/java-shib-common/!svn/ver/979/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/ShibScopedValueOptionalAttributes.xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries
deleted file mode 100644
index a5ae844..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/entries
+++ /dev/null
@@ -1,266 +0,0 @@
-10
-
-dir
-1091
-https://svn.shibboleth.net/java-shib-common/branches/REL_1/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl
-https://svn.shibboleth.net/java-shib-common
-
-
-
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-767a48ae-5022-0410-a543-991e1dd9561f
-

-ShibMDScope.xml
-file
-
-
-
-
-2014-02-19T17:27:40.874741Z
-56b4858b1208766492ebe39640895fb2
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-137
-

-ShibScopedValue.xml
-file
-
-
-
-
-2014-02-19T17:27:40.874741Z
-266a7f6f7eed4e16ad6647781e6c454e
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-159
-

-ShibMDKeyAuthorityOptionalAttributes.xml
-file
-
-
-
-
-2014-02-19T17:27:40.874741Z
-cd62a6fd97b8cbf63de6120c5ff15ea4
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-202
-

-ShibMDKeyAuthority.xml
-file
-
-
-
-
-2014-02-19T17:27:40.874741Z
-fb81530701a7dd5f6497359deb71af08
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-110
-

-ShibMDKeyAuthorityChildElements.xml
-file
-
-
-
-
-2014-02-19T17:27:40.874741Z
-833eb81ab978c5ae4e61bba465b7b664
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-250
-

-ShibMDScopeOptionalAttributes.xml
-file
-
-
-
-
-2014-02-19T17:27:40.874741Z
-59cbfc02d3c2afb3d8edf9e77df179ee
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-151
-

-ShibScopedValueOptionalAttributes.xml
-file
-
-
-
-
-2014-02-19T17:27:40.874741Z
-ae29fcc4311486dc518f5b7153d5ffe8
-2011-06-02T17:40:39.386085Z
-979
-lajoie
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-167
-

diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthority.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthority.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthority.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityChildElements.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityChildElements.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityChildElements.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityOptionalAttributes.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityOptionalAttributes.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDKeyAuthorityOptionalAttributes.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScope.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScope.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScope.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScopeOptionalAttributes.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScopeOptionalAttributes.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibMDScopeOptionalAttributes.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValue.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValue.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValue.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValueOptionalAttributes.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValueOptionalAttributes.xml.svn-base
deleted file mode 100644
index 94feee6..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/prop-base/ShibScopedValueOptionalAttributes.xml.svn-base
+++ /dev/null
@@ -1,9 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-K 13
-svn:mime-type
-V 8
-text/xml
-END
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthority.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthority.xml.svn-base
deleted file mode 100644
index ddb1228..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthority.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityChildElements.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityChildElements.xml.svn-base
deleted file mode 100644
index 890bc13..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityChildElements.xml.svn-base
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-    <ds:KeyInfo/>
-    <ds:KeyInfo/>
-    <ds:KeyInfo/>
-    <ds:KeyInfo/>
-</shibmd:KeyAuthority>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityOptionalAttributes.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityOptionalAttributes.xml.svn-base
deleted file mode 100644
index 08751c1..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDKeyAuthorityOptionalAttributes.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:test="http://www.example.org/testObjects" VerifyDepth="5" test:UnknownAttrib="FooBar"/>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScope.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScope.xml.svn-base
deleted file mode 100644
index cd88636..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScope.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">ThisIsSomeScopeValue</shibmd:Scope>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScopeOptionalAttributes.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScopeOptionalAttributes.xml.svn-base
deleted file mode 100644
index 81931ac..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibMDScopeOptionalAttributes.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">ThisIsSomeScopeValue</shibmd:Scope>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValue.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValue.xml.svn-base
deleted file mode 100644
index 204d007..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValue.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<encoder:ScopedValue xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder">member at example.edu</encoder:ScopedValue>
diff --git a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValueOptionalAttributes.xml.svn-base b/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValueOptionalAttributes.xml.svn-base
deleted file mode 100644
index 001dbb0..0000000
--- a/src/test/resources/data/edu/internet2/middleware/shibboleth/common/xmlobject/impl/.svn/text-base/ShibScopedValueOptionalAttributes.xml.svn-base
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<encoder:ScopedValue xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" scope="example.edu">member</encoder:ScopedValue>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libshib-common-java.git



More information about the pkg-java-commits mailing list