[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Aug  4 14:43:27 2014
New Revision: 6396

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6396&view=rev
Log:
IDP-456 Cleanup logging

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/PopulateEncryptionParameters.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java?rev=6396&r1=6395&r2=6396&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java Mon Aug  4 14:43:27 2014
@@ -201,7 +201,7 @@
 
             if (requestedAttribute instanceof IdPRequestedAttribute
                     && !((IdPRequestedAttribute) requestedAttribute).getIsRequired() && onlyIfRequired) {
-                log.debug("{} Attribute {} found in metadata, but was not required" + ", values not matched",
+                log.debug("{} Attribute {} found in metadata, but was not required, values not matched",
                         getLogPrefix(), attribute.getId());
                 continue;
             }

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java?rev=6396&r1=6395&r2=6396&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java Mon Aug  4 14:43:27 2014
@@ -248,8 +248,8 @@
                     resolvedAttribute.getValues());
         }
 
-        log.trace("{} associating the following display descriptions" + " with the resolved attribute: {}",
-                getLogPrefix(), getDisplayDescriptions());
+        log.trace("{} associating the following display descriptions with the resolved attribute: {}", getLogPrefix(),
+                getDisplayDescriptions());
         resolvedAttribute.setDisplayDescriptions(getDisplayDescriptions());
 
         log.trace("{} associating the following display names with the resolved attribute: {}", getLogPrefix(),

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java?rev=6396&r1=6395&r2=6396&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java Mon Aug  4 14:43:27 2014
@@ -200,8 +200,8 @@
             if (propagateResolutionExceptions) {
                 throw e;
             } else {
-                log.debug("Resolver {} produced the following" + " error but was configured not to propogate it.",
-                        new Object[] {getId(), e,});
+                log.debug("Resolver plugin '{}' produced the following error but was configured not to propagate it.",
+                        getId(), e);
                 return null;
             }
         }

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java

[... 78 lines stripped ...]