[java-metadata-aggregator COMMIT] in /trunk: aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLi...

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Mar 28 16:07:45 2012
New Revision: 209

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=209&view=rev
Log:
fix use of wrong DOM call (ugh, I hate DOM)
javadoc and logging message fixup

Modified:
    trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java

Modified: trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java?rev=209&r1=208&r2=209&view=diff
==============================================================================
--- trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java (original)
+++ trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java Wed Mar 28 16:07:45 2012
@@ -105,11 +105,11 @@
 
             ArrayList<DomElementItem> item = new ArrayList<DomElementItem>();
             Date startTime = new Date();
-            log.info("Pipeline {} execution starting at {}", pipelineName, startTime);
+            log.info("Pipeline '{}' execution starting at {}", pipelineName, startTime);
             pipeline.execute(item);
             Date endTime = new Date();
-            log.info("Pipeline execution completed at {}; run time {} seconds",
-                    endTime, (endTime.getTime()-startTime.getTime())/1000f);
+            log.info("Pipeline '{}' execution completed at {}; run time {} seconds",
+                    new Object[]{pipelineName, endTime, (endTime.getTime()-startTime.getTime())/1000f});
 
             System.exit(RC_OK);
         } catch (Exception e) {

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java?rev=209&r1=208&r2=209&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java Wed Mar 28 16:07:45 2012
@@ -86,7 +86,7 @@
     /** Person types which are white/black listed depending on the value of {@link #whitelistingTypes}. */
     private Set<String> designatedTypes = ImmutableSet.copyOf(allowedTypes);
 
-    /** Whether {@link #designatedType} should be considered a whitelist. Default value: true */
+    /** Whether {@link #designatedTypes} should be considered a whitelist. Default value: true */
     private boolean whitelistingTypes = true;
 
     /**

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java?rev=209&r1=208&r2=209&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java Wed Mar 28 16:07:45 2012
@@ -64,7 +64,7 @@
         Attr idAttribute = AttributeSupport.getAttribute(element, ID_ATTRIB);
         if (idAttribute == null) {
             idAttribute = AttributeSupport.constructAttribute(element.getOwnerDocument(), ID_ATTRIB);
-            element.appendChild(idAttribute);
+            element.setAttributeNode(idAttribute);
         }
 
         idAttribute.setValue(idGenerator.generateIdentifier());