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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 16 09:44:17 2014
New Revision: 6089

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6089&view=rev
Log:
Fix build

Modified:
    trunk/idp-attribute-filter-impl/pom.xml
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeInMetadataPolicyRule.java

Modified: trunk/idp-attribute-filter-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/pom.xml?rev=6089&r1=6088&r2=6089&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/pom.xml (original)
+++ trunk/idp-attribute-filter-impl/pom.xml Mon Jun 16 09:44:17 2014
@@ -25,6 +25,11 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-attribute-filter-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeInMetadataPolicyRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeInMetadataPolicyRule.java?rev=6089&r1=6088&r2=6089&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeInMetadataPolicyRule.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeInMetadataPolicyRule.java Mon Jun 16 09:44:17 2014
@@ -32,21 +32,17 @@
 import net.shibboleth.idp.attribute.filter.Matcher;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.idp.saml.attribute.mapping.AttributesMapContainer;
-import net.shibboleth.idp.saml.context.AttributeConsumingServiceContext;
-import net.shibboleth.idp.saml.profile.config.navigate.AttributeConsumerServiceLookupFunction;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.core.xml.XMLObject;
-import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
-import com.google.common.base.Functions;
 import com.google.common.collect.Multimap;
 
 /**
@@ -69,17 +65,6 @@
 
     /** The strategy to get the appropriate XMLObject from the context. */
     @Nonnull private Function<SAMLMetadataContext, ? extends XMLObject> objectStrategy;
-
-    /**
-     * Constructor.
-     * 
-     */
-    public AttributeInMetadataPolicyRule() {
-        objectStrategy =
-                Functions.compose(new AttributeConsumerServiceLookupFunction(),
-                        new ChildContextLookup<SAMLMetadataContext, AttributeConsumingServiceContext>(
-                                AttributeConsumingServiceContext.class));
-    }
 
     /**
      * Gets whether optionally requested attributes should be matched.