[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src/main/java: edu/internet2/middleware/shibbol...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May  8 12:46:14 2013
New Revision: 4470

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4470&view=rev
Log:
IDP-273 Cleanup pass over log messages (and eyball the test logs to coherence)

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrescopedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrincipalAuthenticationMethodAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrincipalNameAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexSplitAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SimpleAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/StaticAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java?rev=4470&r1=4469&r2=4470&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java Wed May  8 12:46:14 2013
@@ -30,7 +30,7 @@
 public class BasicAttribute extends ScriptedAttribute {
 
     /** Log. */
-    private Logger log = LoggerFactory.getLogger(BasicAttribute.class);
+    private Logger log = LoggerFactory.getLogger(ScriptedAttribute.class);
 
     /**
      * Constructor.
@@ -38,8 +38,7 @@
      * @param id The attribute Id.
      */
     public BasicAttribute(String id) {
-        super(new Attribute(id));
-        log.info("Scripted Attribute Definition: {} Use of V2 emulated class \""
-                + "BasicAttribute\", consider replacing this code", id);
+        super(new Attribute(id), "Scripted Attribute Definition: ");
+        log.info("{}  Use of V2 emulated class \"BasicAttribute\", consider replacing this code", getLogPrefix());
     }
 }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java?rev=4470&r1=4469&r2=4470&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java Wed May  8 12:46:14 2013
@@ -55,64 +55,59 @@
     /** {@inheritDoc} */
     protected void doInitialize() throws ComponentInitializationException {
         if (0 == idLifetime) {
-            log.debug("Attribute definition {}: set default lifetime of 4 hours.", getId());
+            log.debug("set default lifetime of 4 hours.", getLogPrefix());
             idLifetime = 1000 * 60 * 60 * 4;
         }
         if (null == dataSealer) {
-            throw new ComponentInitializationException("Attribute Resolver " + getId()

[... 945 lines stripped ...]