[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingp...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jul  3 09:23:11 2014
New Revision: 6213

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6213&view=rev
Log:
IDP-390 Name clean up.  Revert a lot of r6204 (they *are* types).  CRL not Crl

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicFilesystemCredentialParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicInlineCredentialParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/ResourceCredentialParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509FilesystemCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509FilesystemCredentialParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509InlineCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509InlineCredentialParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXResourceBackedValidationInfoParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticPKIXSignatureParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/UnsupportedTrustEngineParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java?rev=6213&r1=6212&r2=6213&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java Thu Jul  3 09:23:11 2014
@@ -49,25 +49,25 @@
 
     /** {@inheritDoc} */
     @Override public void init() {
-        registerBeanDefinitionParser(X509FilesystemCredentialParser.ELEMENT_NAME, new X509FilesystemCredentialParser());
-        registerBeanDefinitionParser(X509InlineCredentialParser.ELEMENT_NAME, new X509InlineCredentialParser());
-        registerBeanDefinitionParser(BasicInlineCredentialParser.ELEMENT_NAME, new BasicInlineCredentialParser());
-        registerBeanDefinitionParser(BasicFilesystemCredentialParser.ELEMENT_NAME,
+        registerBeanDefinitionParser(X509FilesystemCredentialParser.TYPE_NAME, new X509FilesystemCredentialParser());
+        registerBeanDefinitionParser(X509InlineCredentialParser.TYPE_NAME, new X509InlineCredentialParser());
+        registerBeanDefinitionParser(BasicInlineCredentialParser.TYPE_NAME, new BasicInlineCredentialParser());
+        registerBeanDefinitionParser(BasicFilesystemCredentialParser.TYPE_NAME,
                 new BasicFilesystemCredentialParser());
 
-        registerBeanDefinitionParser(StaticExplicitKeySignatureParser.ELEMENT_NAME,
+        registerBeanDefinitionParser(StaticExplicitKeySignatureParser.TYPE_NAME,
                 new StaticExplicitKeySignatureParser());
-        registerBeanDefinitionParser(StaticPKIXSignatureParser.ELEMENT_NAME, new StaticPKIXSignatureParser());
-        registerBeanDefinitionParser(SignatureChainingParser.ELEMENT_NAME, new SignatureChainingParser());
+        registerBeanDefinitionParser(StaticPKIXSignatureParser.TYPE_NAME, new StaticPKIXSignatureParser());
+        registerBeanDefinitionParser(SignatureChainingParser.TYPE_NAME, new SignatureChainingParser());
 
         // Metadata based unsupported
-        registerBeanDefinitionParser(UnsupportedTrustEngineParser.METADATA_EXPLICIT_KEY,
+        registerBeanDefinitionParser(UnsupportedTrustEngineParser.METADATA_EXPLICIT_KEY_TYPE,
                 new UnsupportedTrustEngineParser());

[... 292 lines stripped ...]