[java-metadata-aggregator COMMIT] in /trunk: aggregator-parent/doc/RELEASE-NOTES.txt aggregator-pipeline/src/main/jav...

[noreply at shibboleth.net]

Author: iay
Date: Tue Jan 21 10:58:34 2014
New Revision: 328

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=328&view=rev
Log:
MDA-122: remove unimplemented stages and properties

Modified:
    trunk/aggregator-parent/doc/RELEASE-NOTES.txt
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityPublisherPathFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PushDownCacheDurationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PushDownValidUntilStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetPublicationInfo.java

Modified: trunk/aggregator-parent/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-parent/doc/RELEASE-NOTES.txt?rev=328&r1=327&r2=328&view=diff
==============================================================================
--- trunk/aggregator-parent/doc/RELEASE-NOTES.txt (original)
+++ trunk/aggregator-parent/doc/RELEASE-NOTES.txt Tue Jan 21 10:58:34 2014
@@ -5,7 +5,16 @@
     * Now using Spring resources instead of (now deprecated) Shibboleth
       resources.
 
+API Changes
+    * ElementFormattingStage removed
+    * EntityPublisherPathFilterStage removed
+    * PushDownCacheDurationStage removed
+    * PushDownValidUntilStage removed
+    * SetPublicationInfo removed
+    * XMLSignatureSigningStage's deriveKeyNames property
+
 ** Task
+    * [MDA-122] - remove unimplemented stages and properties
     * [MDA-124] - Move from using Shibboleth resources to using Spring ones
     * [MDA-125] - can't set some properties on XMLSignatureValidationStage from
                   Spring configurations

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java?rev=328&r1=327&r2=328&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java Tue Jan 21 10:58:34 2014
@@ -205,12 +205,6 @@
     /** Explicit names to associate with the given signing key. Default value: empty list */
     private List<String> keyNames;
 
-    /**
-     * Whether additional key names should be derived from the end-entity certificate, if present. Default value:
-     * <code>true</code>
-     */
-    private boolean deriveKeyNames;
-
     /** Whether key names should be included in the signature's KeyInfo. Default value: <code>true</code> */
     private boolean includeKeyNames;
 
@@ -251,7 +245,6 @@
         inclusivePrefixList = Collections.emptyList();
         idAttributeNames = Lists.newArrayList(new QName("ID"), new QName("id"), new QName("Id"));
         keyNames = Collections.emptyList();
-        deriveKeyNames = true;
         includeKeyNames = true;
         includeX509Certificates = true;
     }
@@ -479,27 +472,6 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         keyNames = ImmutableList.copyOf(Iterables.filter(names, Predicates.notNull()));
-    }
-
-    /**
-     * Gets whether key names are derived from the end-entity certificate, if present. TODO describe was is derived
-     * 
-     * @return whether key names are derived from the end-entity certificate
-     */
-    public boolean isDeriveKeyNames() {
-        return deriveKeyNames;
-    }
-
-    /**
-     * Sets whether key names are derived from the end-entity certificate.
-     * 
-     * @param deriveNames whether key names are derived from the end-entity certificate
-     */
-    public synchronized void setDeriveKeyNames(final boolean deriveNames) {
-        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-
-        deriveKeyNames = deriveNames;
     }
 
     /**
@@ -872,10 +844,6 @@
             for (String name : keyNames) {
                 keyInfoItems.add(keyInfoFactory.newKeyName(name));
             }
-        }
-
-        if (deriveKeyNames) {
-            // TODO derived key names
         }
     }