[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/filter/Metadata...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 13 19:42:38 2013
New Revision: 3447

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3447&view=rev
Log:
The MetadataNodeProcessor interface can't live in saml-impl, b/c it might need to be implemented by other projects which can't have cross -impl dependencies (e.g. the Shib IdP).  Promote it up to saml-api.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/filter/MetadataNodeProcessor.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilterTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java?rev=3447&r1=3446&r2=3447&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java Fri Sep 13 19:42:38 2013
@@ -22,7 +22,7 @@
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.metadata.EntitiesDescriptorGroupName;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
-import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFilter.MetadataNodeProcessor;
+import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
 import org.opensaml.saml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.slf4j.Logger;

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java?rev=3447&r1=3446&r2=3447&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java Fri Sep 13 19:42:38 2013
@@ -30,6 +30,7 @@
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
+import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
 
 /**
  * An implementation of {@link MetadataFilter} which applies a {@link MetadataNodeProcessor}
@@ -115,21 +116,5 @@
             }
         }
     }
-    
-    /**
-     * A processor of element nodes within a metadata tree.  A particular implementation may process or
-     * handle more than one type of node.
-     */
-    public interface MetadataNodeProcessor {
-        
-        /**
-         * Process a metadata document node.
-         * 
-         * @param metadataNode the metadata node to process
-         * @throws FilterException if a fatal error is encountered while processing the node
-         */
-        public void process(XMLObject metadataNode) throws FilterException;
-        
-    }
 
 }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java?rev=3447&r1=3446&r2=3447&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java Fri Sep 13 19:42:38 2013
@@ -28,7 +28,7 @@
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
 import org.opensaml.saml.criterion.EntityIdCriterion;
 import org.opensaml.saml.metadata.EntitiesDescriptorGroupName;
-import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFilter.MetadataNodeProcessor;
+import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
 import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;

[... 18 lines stripped ...]